Changeset 11406 for trunk

Timestamp:

07/14/11 12:15:03 (13 years ago)

Author:

lyard

Message:

Open the log file right away if path given in configuration

File:

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

trunk/FACT++/src/datalogger.cc

@@ -1555 +1555 @@
         sub.lastReceivedEvent = cTime;
         if (!sub.nightlyFile.IsOpen() || !sub.runFile.IsOpen() || sub.runNumber != sub.runFile.fRunNumber)
-            OpenFITSFilesPlease(sub, cRunNumber);
+            if (GetCurrentState() != kSM_Ready)
+                OpenFITSFilesPlease(sub, cRunNumber);
         WriteToFITS(sub);
 #endif
@@ -2488 +2489 @@
 //   dim_lock();
    const string baseFileName = CompileFileNameWithPath(fNightlyFilePath, "", "");
-    if (fNightlyLogFile.is_open() && !fDestructing)//in case we're destructing the datalogger, wait before closing the log file.
-    {
-        fNightlyLogFile.close();
-        Info("Closed: "+baseFileName+".log");
-    }
+//we should log everything that we can, even if in Ready state. thus removing this closing (done only in the destructor or at day-change)
+//   if (fNightlyLogFile.is_open() && !fDestructing)//in case we're destructing the datalogger, wait before closing the log file.
+//    {
+//        fNightlyLogFile.close();
+//        Info("Closed: "+baseFileName+".log");
+//    }
     if (fNightlyReportFile.is_open())
     {
@@ -2605 +2607 @@
          fRunFilePath     = folder;
          fNightlyFilePath = folder;
+         fFullNightlyLogFileName = CompileFileNameWithPath(fNightlyFilePath, "", "log");
+         if (!OpenTextFilePlease(fNightlyLogFile, fFullNightlyLogFileName))
+             SetCurrentState(kSM_BadNightlyConfig);
     }