Changeset 10707 for trunk/FACT++/src/dataLogger.cc

Timestamp:

05/13/11 15:48:57 (14 years ago)

Author:

tbretz

Message:

Use the functionality of boost program_options better; implemented po_bool() as a special po_switch() case; added some comments.

File:

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

trunk/FACT++/src/dataLogger.cc

@@ -318 +318 @@
 public: 
 //      void setBlackWhiteList(const std::string& , bool);
-        void Setup(Configuration& conf);
+        bool SetConfiguration(Configuration& conf);
 
 private:
@@ -681 +681 @@
         
                 //services parameters
-                fDebugIsOn = true;//false;
+                fDebugIsOn = false;
                 fStatsPeriodDuration = 1.0f;
                 fOpenedFilesIsOn = true;
@@ -1269 +1269 @@
         Message("Run Path: " + actualTargetDir);
         stringstream str;
-        str << "Run Number: " << fRunFileName;
+        str << "Run Number: " << fRunNumber;
         Message(str.str());
         Message("----------- OPENED FILES ----------------");
@@ -1387 +1387 @@
                 Message("Server "+it->first);
                 for (std::map<std::string, SubscriptionType>::const_iterator it2=it->second.begin(); it2!=it->second.end(); it2++)
-                        Message("-> "+it2->first);
+                        Message(" -> "+it2->first);
         }
         if (fIsBlackList)
@@ -1395 +1395 @@
                         Message("----------- ALLOW LIST ------------------");
         for (set<string>::iterator it=fGreyList.begin(); it != fGreyList.end(); it++)
-                Message(*it);
+            Message(*it);
+
+        if (fGreyList.size()==0)
+            Message(" <empty>");
+
         return GetCurrentState();
 }
@@ -2083 +2087 @@
 }
 
-void DataLogger::Setup(Configuration& conf)
-{
+bool DataLogger::SetConfiguration(Configuration& conf)
+{
+    fDebugIsOn = conf.Get<bool>("debug");
+
         //Set the block or allow list
         fGreyList.clear();
@@ -2113 +2119 @@
         }
     }
+
+    return true;
 }
 /*
@@ -2148 +2156 @@
     // Start io_service.run to only use the commandHandler command detaching
     DataLogger logger(wout);
+    if (!logger.SetConfiguration(conf))
+        return -1;
+
     logger.Run(true);
 
@@ -2174 +2185 @@
 
     DataLogger logger(wout);
+    if (!logger.SetConfiguration(conf))
+        return -1;
     
-    logger.Setup(conf);
-
     shell.SetReceiver(logger);
 
@@ -2256 +2267 @@
     const string n = conf.GetName()+".log";
 
-    po::options_description config("Program options");
-    config.add_options()
+    po::options_description configp("Program options");
+    configp.add_options()
         ("dns",       var<string>("localhost"),  "Dim nameserver host name (Overwites DIM_DNS_NODE environment variable)")
         ("log,l",     var<string>(n), "Write log-file")
         ("console,c", var<int>(),     "Use console (0=shell, 1=simple buffered, X=simple unbuffered)")
-        ("block,b", vars<string>(), "Black-list of services")
-        ("allow,a", vars<string>(), "White-list of services")
         ;
 
+    po::options_description configs("Scheduler options");
+    configs.add_options()
+        ("block,b",   vars<string>(), "Black-list of services")
+        ("allow,a",   vars<string>(), "White-list of services")
+        ("debug",     po_bool(),      "Debug mode. Print clear text of received service reports to log-stream")
+        ;
+
     conf.AddEnv("dns", "DIM_DNS_NODE");
 
-    conf.AddOptions(config);
+    conf.AddOptions(configp);
+    conf.AddOptions(configs);
 }
 
@@ -2312 +2329 @@
     Dim::Setup(conf.Get<string>("dns"));
 
-    try
+//    try
     {
         // No console access at all
@@ -2324 +2341 @@
             return RunShell<LocalConsole>(conf);
     }
-    catch (std::exception& e)
+/*    catch (std::exception& e)
     {
         cerr << "Exception: " << e.what() << endl;
         return -1;
-    }
+    }*/
 
     return 0;