REFPLTV-504 : Modified Monitor plugin to return operational state eve…

…n if there are no memory measurements. (cherry picked from commit ba0ace1)
AkshayKumar2794 · Aug 25, 2020 · ddae1c6 · ddae1c6
1 parent f8db63b
commit ddae1c6
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/Monitor/Monitor.config b/Monitor/Monitor.config
@@ -129,11 +129,8 @@ if(ENABLE_OPEN_CDMI)
         kv(operational 1)
         key(restart)
         map()
-           key(operational)
-            map()
-                kv(window 60)
-                kv(limit 3)
-            end()
+            kv(window 60)
+            kv(limit 3)
         end()
     end()
     ans(OPENCDMI_MONITOR_CONFIG)

diff --git a/Monitor/Monitor.h b/Monitor/Monitor.h
@@ -848,10 +848,12 @@ namespace Plugin {
                         info.Restart.Window = object.RestartWindow();
                     }
 
-                    translate(metaData.Allocated(), &info.Measurements.Allocated);
-                    translate(metaData.Resident(), &info.Measurements.Resident);
-                    translate(metaData.Shared(), &info.Measurements.Shared);
-                    translate(metaData.Process(), &info.Measurements.Process);
+                    if (object.HasMeasurement()) {
+                        translate(metaData.Allocated(), &info.Measurements.Allocated);
+                        translate(metaData.Resident(), &info.Measurements.Resident);
+                        translate(metaData.Shared(), &info.Measurements.Shared);
+                        translate(metaData.Process(), &info.Measurements.Process);
+                    }
                     info.Measurements.Operational = metaData.Operational();
                     info.Measurements.Count = metaData.Allocated().Measurements();
 
@@ -861,15 +863,11 @@ namespace Plugin {
                 if (callsign.empty() == false) {
                     auto element = _monitor.find(callsign);
                     if (element != _monitor.end()) {
-                        if (element->second.HasMeasurement() == true) {
-                            AddElement(element->first, element->second);
-                        }
+                        AddElement(element->first, element->second);
                     }
                 } else {
                     for (auto& element : _monitor) {
-                        if (element.second.HasMeasurement() == true) {
-                            AddElement(element.first, element.second);
-                        }
+                        AddElement(element.first, element.second);
                     }
                 }