Changeset 10896

Timestamp:

06/01/11 10:20:14 (14 years ago)

Author:

tbretz

Message:

More updates to PRINT

File:

• trunk/FACT++/src/dataLogger.cc (modified) (4 diffs)

trunk/FACT++/src/dataLogger.cc

@@ -1631 +1631 @@
 int DataLogger::PrintStatePlease(const Event& )
 {
-    Message("-----------------------------------------");
-    Message("------ DATA LOGGER CURRENT STATE --------");
-    Message("-----------------------------------------");
+    Message("------------------------------------------");
+    Message("------- DATA LOGGER CURRENT STATE --------");
+    Message("------------------------------------------");
+
     //print the path configuration
     Message("Nightly Path: " + CheckIfDirIsDot(fNightlyFilePath));
@@ -1644 +1645 @@
         str << "\n" << it->runNumber;
     Message(str);
-    Message("----------- OPENED FILES ----------------");
+
     //print all the open files. 
+    Message("------------ OPENED FILES ----------------");
     if (fNightlyLogFile.is_open())
-        Message("Nightly Log..........OPEN");
+        Message("Nightly log-file: "/*+filename+*/" (OPEN)");
     else
-        Message("Nightly log........CLOSED");
+        Message("Nightly log-file: "/*filename+*/" (CLOSED)");
     if (fNightlyReportFile.is_open())
-        Message("Nightly Report.......OPEN");
+        Message("Nightly report-file: "/*filename+*/" (OPEN)");
     else
-        Message("Nightly Report.....CLOSED");
+        Message("Nightly report-file: "/*filename+*/" (CLOSED)");
     for (list<RunNumberType>::iterator it=fRunNumber.begin(); it!=fRunNumber.end(); it++)
     {
         if (it->logFile->is_open())
-            Message("Run Log " + it->logName + " is OPEN");
+            Message("Run log-file: " + it->logName + " (OPEN)");
         else
-            Message("Run Log " + it->logName + " is CLOSED");
+            Message("Run log-file: " + it->logName + " (CLOSED)");
         if (it->reportFile->is_open())
-            Message("Run Report " + it->reportName + " is OPEN");
+            Message("Run report-file: " + it->reportName + " (OPEN)");
         else
-            Message("Run Report " + it->reportName + " CLOSED");
-    }
+            Message("Run report-file: " + it->reportName + " (CLOSED)");
+    }
+
     bool statWarning = false;
     DataLoggerStats statVar;
     calculateTotalSizeWritten(statVar, statWarning, false);
-    Message("---------------- STATS ------------------");
+    Message("----------------- STATS ------------------");
     str.str("");
     str << "Total Size written: " << statVar.sizeWritten << " bytes.";
@@ -1681 +1684 @@
     else
         Message("Statistics updates are currently disabled");
-    Message("----------- DIM SUBSCRIPTIONS -----------");
-
+
+    Message("------------ DIM SUBSCRIPTIONS -----------");
     str.str("");
-    str << "There are " << fNumSubAndFitsData.numSubscriptions << " active DIM subscriptions:";
+    str << "There are " << fNumSubAndFitsData.numSubscriptions << " active DIM subscriptions.";
     Message(str);
 
@@ -1694 +1697 @@
     }
 
-    Message("------------- BLOCK LIST ----------------");
+    Message("--------------- BLOCK LIST ---------------");
     for (set<string>::iterator it=fBlackList.begin(); it != fBlackList.end(); it++)
-        Message(*it);
+        Message(" -> "+*it);
     if (fBlackList.size()==0)
         Message(" <empty>");
 
-    Message("----------- ALLOW LIST ------------------");
+    Message("--------------- ALLOW LIST ---------------");
     for (set<string>::iterator it=fWhiteList.begin(); it != fWhiteList.end(); it++)
-        Message(*it);
+        Message(" -> "+*it);
     if (fWhiteList.size()==0)
         Message(" <empty>");
 
-    Message("--------- GROUPING LIST -----------------");
-    Message("The following servers and/or services will be grouping under a single run fits file:");
+    Message("-------------- GROUPING LIST -------------");
+    Message("The following servers and/or services will");
+    Message("be grouped into a single fits file:");
     for (set<string>::iterator it=fGrouping.begin(); it != fGrouping.end(); it++)
-        Message(*it);
+        Message(" -> "+*it);
     if (fGrouping.size()==0)
         Message(" <no grouping>");
 
-    Message("-----------------------------------------");
-    Message("------ END OF DATA LOGGER STATE ---------");
-    Message("-----------------------------------------");
+    Message("------------------------------------------");
+    Message("-------- END OF DATA LOGGER STATE --------");
+    Message("------------------------------------------");
 
     return GetCurrentState();