Changeset 16876 for trunk/FACT++

Timestamp:

06/21/13 13:38:47 (11 years ago)

Author:

lyard

Message:

removed wrong error tags in log files

File:

• trunk/FACT++/src/datalogger.cc (modified) (1 diff)

trunk/FACT++/src/datalogger.cc

@@ -1507 +1507 @@
             Error(err.str());
         }
+
+        bool isMessage = (sub.service == "MESSAGE");
         ostringstream msg;
-        string serviceName = (sub.service == "MESSAGE") ? "" : "_"+sub.service;
-        msg << sub.server << serviceName << ": " << strings[0];
+        string serviceName = isMessage ? "" : "_"+sub.service;
+        msg << sub.server << serviceName;
+
+        //fix the quality of non message "messages"
+        if (!isMessage)
+        {
+            msg << " (" << fQuality << ")";
+            fQuality = kMessage;
+        }
+
+        //special case for alarm reset
+        if (isMessage && (fQuality == kAlarm) && (strings[0] == ""))
+        {
+            fQuality = kInfo;
+            strings[0] = "Alarm reset";
+        }
+        msg << ": " << strings[0];
 
         if (fNightlyLogFile.is_open())