From 9b58b97ebbb843cd0e15b623db42718c8e040ad1 Mon Sep 17 00:00:00 2001
From: David Hill <david.hill@mariadb.com>
Date: Tue, 6 Dec 2016 19:43:27 +0000
Subject: [PATCH] put the alarm abck like develop

---
 oamapps/alarmmanager/alarmmanager.cpp | 47 +++++++++------------------
 oamapps/alarmmanager/alarmmanager.h   |  2 --
 procmgr/processmanager.cpp            |  4 +--
 3 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/oamapps/alarmmanager/alarmmanager.cpp b/oamapps/alarmmanager/alarmmanager.cpp
index a94d375f8..e03f38b4d 100644
--- a/oamapps/alarmmanager/alarmmanager.cpp
+++ b/oamapps/alarmmanager/alarmmanager.cpp
@@ -283,12 +283,12 @@ void processAlarm(const Alarm& calAlarm)
 }
 
 /*****************************************************************************************
-* @brief	processAlarmReport
+* @brief	configAlarm
 *
-* purpose:	Process Alarm Report
+* purpose:	Get Config Data for Incoming alarm
 *
 *****************************************************************************************/
-void ALARMManager::processAlarmReport (Alarm& calAlarm)
+void configAlarm (Alarm& calAlarm)
 {
 	int alarmID = calAlarm.getAlarmID();
 	Oam oam;
@@ -299,7 +299,7 @@ void ALARMManager::processAlarmReport (Alarm& calAlarm)
 		MessageLog ml(lid);                        
 		Message msg;                        
 		Message::Args args;                        
-		args.add("processAlarmReport Called");                        
+		args.add("configAlarm Called");                        
 		msg.format(args);                        
 		ml.logDebugMessage(msg);                
 	}
@@ -437,33 +437,19 @@ void ALARMManager::sendAlarmReport (const char* componentID, int alarmID, int st
 	}
 	else
 		processName = repProcessName;
+	
+	Alarm calAlarm;
+	
+	calAlarm.setAlarmID (alarmID);
+	calAlarm.setComponentID (componentID);
+	calAlarm.setState (state);
+	calAlarm.setSname (ModuleName);
+	calAlarm.setPname (processName);
+	calAlarm.setPid (pid);
+	calAlarm.setTid (tid); 
 
-	//send request to ProcMgr to be processed
-	ByteStream msg1;
-
-    msg1 << (ByteStream::byte) REQUEST;
-    msg1 << oam::PROCESSALARM;
-    msg1 << (ByteStream::byte) alarmID;
-    msg1 << (std::string) componentID;
-    msg1 << (ByteStream::byte) state;
-    msg1 << (std::string) ModuleName;
-    msg1 << (std::string) processName;
-    msg1 << (ByteStream::byte) pid;
-    msg1 << (ByteStream::byte) tid;
-
-    try
-    {
-    	//send the msg to Process Manager
-    	MessageQueueClient procmgr("ProcMgr");
-    	procmgr.write(msg1);
-
-        procmgr.shutdown();
-    }
-    catch (...)
-    {}
-
-            //There's other reasons, but this is the most likely...
-/*	try {
+	// Get alarm configuration
+	try {
   		configAlarm (calAlarm);
 	} catch (runtime_error& e)
 	{
@@ -476,7 +462,6 @@ void ALARMManager::sendAlarmReport (const char* componentID, int alarmID, int st
 			msg.format(args);                                
 			ml.logErrorMessage(msg);                                
 	}
-*/
 
 	return;
 #endif //SKIP_ALARM
diff --git a/oamapps/alarmmanager/alarmmanager.h b/oamapps/alarmmanager/alarmmanager.h
index 9c8da9977..28909cbb7 100644
--- a/oamapps/alarmmanager/alarmmanager.h
+++ b/oamapps/alarmmanager/alarmmanager.h
@@ -75,8 +75,6 @@ public:
 						 const int state,
 						 std::string repModuleName = "",
 						 std::string repProcessName = "");
-       
-	 EXPORT void processAlarmReport ( Alarm& calAlarm );
 
 
 	/** @brief return active alarm list
diff --git a/procmgr/processmanager.cpp b/procmgr/processmanager.cpp
index 4b9e3d5dd..0d7f2c64c 100644
--- a/procmgr/processmanager.cpp
+++ b/procmgr/processmanager.cpp
@@ -2628,7 +2628,7 @@ void processMSG(messageqcpp::IOSocket* cfIos)
 
 					break;	
 				}
-
+/*
              	case PROCESSALARM:
                 {
                     log.writeLog(__LINE__,  "MSG RECEIVED: Process Alarm Message");
@@ -2665,7 +2665,7 @@ void processMSG(messageqcpp::IOSocket* cfIos)
                     break;
                 }
 
-
+*/
 				default:
 					log.writeLog(__LINE__,  "MSG RECEIVED: Invalid type" );
 					break;