Changeset 14498 for trunk/FACT++/src

Timestamp:

10/19/12 14:31:47 (12 years ago)

Author:

tbretz

Message:

Added the possibility to send at least one custom alarm from dimctrl.

File:

• trunk/FACT++/src/smartfact.cc (modified) (3 diffs)

trunk/FACT++/src/smartfact.cc

@@ -438 +438 @@
 
     EventHist fControlMessageHist;
+    EventHist fControlAlarmHist;
     int32_t   fControlScriptDepth;
 
@@ -705 +706 @@
             return GetCurrentState();
 
-        if (d.GetQoS()==90)
+        if (d.GetQoS()==MessageImp::kAlarm)
+        {
+            if (d.GetSize()==1)
+                for (auto it=fControlAlarmHist.begin(); it!=fControlAlarmHist.end(); it++)
+                    it->time = Time(Time::none);
+            else
+                fControlAlarmHist.add(d.GetText(), d.GetTime());
+        }
+
+        if (d.GetQoS()==MessageImp::kComment)
             HandleControlMessageImp(d);
 
@@ -2293 +2303 @@
         newerr |= SetError(fFreeSpace<50000000000,
                            "Less than 50GB disk space left.");
+
+        for (auto it=fControlAlarmHist.begin(); it!=fControlAlarmHist.end(); it++)
+        {
+            newerr |= SetError(it->time.IsValid(), it->msg);
+            if (!it->time)
+                fControlAlarmHist.erase(it);
+        }
 
         fLastRunFinishedWithZeroEvents = false;