Changeset 11500

Timestamp:

07/21/11 09:31:57 (13 years ago)

Author:

lyard

Message:

fixed a bug related to bad services formatting

File:

• trunk/FACT++/src/datalogger.cc (modified) (9 diffs)

trunk/FACT++/src/datalogger.cc

@@ -969 +969 @@
     {
 //        dim_lock();
+        fNightlyLogFile << endl;
         fNightlyLogFile.close();
 //        dim_unlock();
@@ -1233 +1234 @@
             Debug("Its Noon! Closing and reopening nightly text files");
 
+        fNightlyLogFile << endl;
         fNightlyLogFile.close();
         fNightlyReportFile.close();
@@ -1246 +1248 @@
             return;
         }
+        fNightlyLogFile << endl;
 
         fFullNightlyReportFileName = CompileFileNameWithPath(fNightlyFilePath, "", "rep");
@@ -1336 +1339 @@
             //remove this subscription from the list.
             //because these operators use references to elements, and because they're supposed here to erase these objects on the way, I'm not too sure... so duplicate the names !
-            string server = sub.server;
-            string service = sub.service;
-            fServiceSubscriptions.find(server)->second.erase(service);
+            RemoveService(sub.server, sub.service, false);
+//            string server = sub.server;
+//            string service = sub.service;
+//            fServiceSubscriptions.find(server)->second.erase(service);
             return;
         }
@@ -1397 +1401 @@
             //remove this subscription from the list.
             //because these operators use references to elements, and because they're supposed here to erase these objects on the way, I'm not too sure... so duplicate the names !
-            string server = sub.server;
-            string service = sub.service;
-            fServiceSubscriptions.find(server)->second.erase(service);
+            RemoveService(sub.server, sub.service, false);
+//            string server = sub.server;
+//            string service = sub.service;
+//            fServiceSubscriptions.find(server)->second.erase(service);
             return;
         }
@@ -1776 +1781 @@
     }
     fFullNightlyLogFileName = CompileFileNameWithPath(fNightlyFilePath, "", "log");
+    bool nightlyLogOpen = fNightlyLogFile.is_open();
     if (!OpenTextFilePlease(fNightlyLogFile, fFullNightlyLogFileName))
         return kSM_BadNightlyConfig;
-
+    if (!nightlyLogOpen)
+        fNightlyLogFile << endl;
 
     fFullNightlyReportFileName = CompileFileNameWithPath(fNightlyFilePath, "", "rep");
@@ -2002 +2009 @@
             {
                 sub.nightlyFile.Close();
+                RemoveService(sub.server, sub.service, false);
                 GoToNightlyWriteErrorState();
                 return;
@@ -2012 +2020 @@
             {
                 sub.runFile.Close();
+                RemoveService(sub.server, sub.service, false);
                 GoToRunWriteErrorState();
                 return;
@@ -2385 +2394 @@
          else
          {
+             fNightlyLogFile << endl;
              NotifyOpenedFile(fFullNightlyLogFileName, 1, fOpenedNightlyFiles);
              for (vector<string>::iterator it=backLogBuffer.begin();it!=backLogBuffer.end();it++)