X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=alarm%2Falarm.go;h=cb18dd75e894e1139efb3cba0751122b887ae846;hb=eac4451ac1e5434b5ae4ee4fd41208a3b2edcf79;hp=329162171e10a85cd9e2101cc12fcb0bcbc3f82c;hpb=b2f29a8c259cd2dd57d89585f211895ed5dfd748;p=ric-plt%2Falarm-go.git

diff --git a/alarm/alarm.go b/alarm/alarm.go
index 3291621..cb18dd7 100755
--- a/alarm/alarm.go
+++ b/alarm/alarm.go
@@ -31,7 +31,7 @@ import (
 
 /*
 #cgo CFLAGS: -I../
-#cgo LDFLAGS: -lrmr_nng -lnng
+#cgo LDFLAGS: -lrmr_si
 
 #include "utils.h"
 */
@@ -41,17 +41,13 @@ import "C"
 // The MO and APP identities are given as a parameters.
 // The identities are used when raising/clearing alarms, unless provided by the applications.
 func InitAlarm(mo, id string) (*RICAlarm, error) {
-	if ctx := C.rmrInit(); ctx != nil {
-		r := &RICAlarm{
-			moId:   mo,
-			appId:  id,
-			rmrCtx: ctx,
-		}
-
-		return r, nil
+	r := &RICAlarm{
+		moId:  mo,
+		appId: id,
 	}
+	go InitRMR(r)
 
-	return nil, errors.New("rmrInit failed!")
+	return r, nil
 }
 
 // Create a new Alarm instance
@@ -128,8 +124,11 @@ func (r *RICAlarm) AlarmString(a AlarmMessage) string {
 }
 
 func (r *RICAlarm) sendAlarmUpdateReq(a AlarmMessage) error {
-	log.Println("Sending alarm: ", r.AlarmString(a))
+	if r.rmrCtx == nil || !r.rmrReady {
+		return errors.New("RMR no ready yet!")
+	}
 
+	log.Println("Sending alarm: ", r.AlarmString(a))
 	payload, err := json.Marshal(a)
 	if err != nil {
 		return err
@@ -157,3 +156,13 @@ func (r *RICAlarm) ReceiveMessage(cb func(AlarmMessage)) error {
 	}
 	return errors.New("rmrRcv failed!")
 }
+
+func InitRMR(r *RICAlarm) error {
+	if ctx := C.rmrInit(); ctx != nil {
+		r.rmrCtx = ctx
+		r.rmrReady = true
+		return nil
+	}
+
+	return errors.New("rmrInit failed!")
+}