Changeset 11405 for trunk/FACT++/src/datalogger.cc

Timestamp:

07/14/11 11:42:42 (13 years ago)

Author:

lyard

Message:

various improvements of the datalogger

File:

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

trunk/FACT++/src/datalogger.cc

@@ -506 +506 @@
 void DataLogger::RemoveService(const string& server, const string& service, bool isCmd)
 {
+    if (fDestructing)//this function is called by the super class, after the destructor has deleted its own subscriptions
+        return;
+
     if (isCmd)
         return;
@@ -1052 +1055 @@
 {
     if (fDebugIsOn)
-    {
         Debug("DataLogger destruction starts");    
-    }
+
+    //this boolean should not be required anymore, because it
     fDestructing = true;
-    //first let's go to the ready state
-    GoToReadyPlease(); 
+
+    //first, let's backup the datalogger/message service subscription
+    shared_ptr<DimStampedInfo> messageBackup;
+    bool dataloggerMessageFound = false;
+    SubscriptionsListType::iterator x;
+    map<string, SubscriptionType>::iterator y;
+    x = fServiceSubscriptions.find("DATA_LOGGER");
+    if (x != fServiceSubscriptions.end())
+    {
+        y = x->second.find("MESSAGE");
+        if (y != x->second.end())
+        {
+            dataloggerMessageFound = true;
+            messageBackup = y->second.dimInfo;
+        }
+    }
+
     dim_lock();
-    //release the services subscriptions
+
+     //now clear the services subscriptions
     fServiceSubscriptions.clear();
 
     //clear any remaining run number (should remain only one)
     while (fRunNumber.size() > 0)
-     {
+    {
          RemoveOldestRunNumber();
-     }
-//    dim_unlock();
+    }
+    //go to the ready state. i.e. close all files, run-wise first
+    GoToReadyPlease();
+
+    dim_unlock();
+
+    Info("Will soon close the daily log file");
+
     delete fOpenedNightlyFiles;
     delete fOpenedRunFiles;
     delete fNumSubAndFits;
-//    delete fStatsMonitoring;
+
+    //release message service before closing nightly log file
+    if (dataloggerMessageFound)
+        messageBackup.reset();
+
+    if (fNightlyLogFile.is_open())//this file is the only one that has not been closed by GoToReadyPlease
+    {
+        dim_lock();
+        fNightlyLogFile.close();
+        dim_unlock();
+    }
 
     if (fDebugIsOn)
-    {
         Debug("DataLogger desctruction ends");    
-    }
 }
 // --------------------------------------------------------------------------
@@ -1133 +1166 @@
 void DataLogger::infoHandler()
 {
-    // Make sure getTimestamp is called _before_ getTimestampMillisecs
-    if (fDestructing)
-        return;
-
     DimInfo* I = getInfo();
 
@@ -1360 +1389 @@
     const bool isItaReport = fmt!="C";
 
-    if (!fNightlyReportFile.is_open())
+    if (!fNightlyLogFile.is_open())
         return;
 
@@ -1481 +1510 @@
             ostringstream str;
             str << "Parsing service " << sub.dimInfo->getName();
-            str << " failed: " << e.what();
+            str << " failed: " << e.what() << " removing the subscription for now.";
             Error(str);
-//            if (fDebugIsOn)
-//           {
-//              ostringstream str2;
-//             str2 << sub.dimInfo->getString() << "\n";
-//                Debug(str2);
-//            }
+            //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);
             return;
         }
@@ -1533 +1561 @@
     else
     {//write entry to both Nightly and run logs
-        vector<string> strings = sub.fConv->ToStrings(I->getData());
+        vector<string> strings;
+        try
+        {
+           strings = sub.fConv->ToStrings(I->getData());
+        }
+        catch (const runtime_error &e)
+        {
+            ostringstream str;
+            str << "Parsing service " << sub.dimInfo->getName();
+            str << " failed: " << e.what() << " removing the subscription for now.";
+            Error(str);
+            //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);
+            return;
+        }
         if (strings.size() > 1)
         {
@@ -2443 +2488 @@
 //   dim_lock();
    const string baseFileName = CompileFileNameWithPath(fNightlyFilePath, "", "");
-    if (fNightlyLogFile.is_open())
+    if (fNightlyLogFile.is_open() && !fDestructing)//in case we're destructing the datalogger, wait before closing the log file.
     {
         fNightlyLogFile.close();