X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=manager%2Fcmd%2Fmanager.go;h=0036679f42c1693da3810dcc6412314d609cdb1d;hb=e92822cba904bab04c5c71a9ffa99a1d89409640;hp=f7ad81e7e5cdaa8b683dbe11a58d2e903e25ea95;hpb=18fd03c7dd490347eeec3ed60e176fb3a8ccc3c7;p=ric-plt%2Falarm-go.git

diff --git a/manager/cmd/manager.go b/manager/cmd/manager.go
index f7ad81e..0036679 100755
--- a/manager/cmd/manager.go
+++ b/manager/cmd/manager.go
@@ -103,24 +103,27 @@ func (a *AlarmManager) ProcessAlarm(m *AlarmNotification) (*alert.PostAlertsOK,
 
 	// Clear alarm if found from active alarm list
 	if m.AlarmAction == alarm.AlarmActionClear {
-		if found {
-			if a.ProcessClearAlarm(m, alarmDef, idx) == false {
-				return nil, nil
-			}
-			if a.postClear {
-				a.mutex.Unlock()
+		if !found {
+			app.Logger.Info("No matching active alarm found, suppressing ...")
+			a.mutex.Unlock()
+			return nil, nil
+		}
 
-				// Send alarm notification to NOMA, if enabled
-				if app.Config.GetBool("controls.noma.enabled") {
-					m.PerceivedSeverity = alarm.SeverityCleared
-					return a.PostAlarm(m)
-				}
-				return a.PostAlert(a.GenerateAlertLabels(m.Alarm, AlertStatusResolved, m.AlarmTime))
-			}
+		if a.ProcessClearAlarm(m, alarmDef, idx) == false {
+			return nil, nil
 		}
-		app.Logger.Info("No matching active alarm found, suppressing ...")
+
 		a.mutex.Unlock()
-		return nil, nil
+		if !a.postClear {
+			app.Logger.Info("Sending clear notification disabled!")
+			return nil, nil
+		}
+
+		// Send alarm notification to NOMA, if enabled
+		if app.Config.GetBool("controls.noma.enabled") {
+			m.PerceivedSeverity = alarm.SeverityCleared
+			return a.PostAlarm(m)
+		}
 	}
 
 	// New alarm -> update active alarms and post to Alert Manager