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

Timestamp:

07/24/11 21:00:00 (13 years ago)

Author:

tbretz

Message:

Moved common option setup to Main.h; created Main namespace

File:

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

trunk/FACT++/src/datalogger.cc

@@ -2394 +2394 @@
 int RunShell(Configuration &conf)
 {
-    return Main<T, DataLogger>(conf, true);
+    return Main::execute<T, DataLogger>(conf, true);
 }
 
@@ -2445 +2445 @@
 void SetupConfiguration(Configuration &conf)
 {
-    const string n = conf.GetName()+".log";
-
-    po::options_description configp("Program options");
-    configp.add_options()
-        ("dns",       var<string>("localhost"),       "Dim nameserver (overwites DIM_DNS_NODE environment variable)")
-        ("host",      var<string>(""),                "Address with which the Dim nameserver can connect to this host (overwites DIM_HOST_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)")
-        ("cmd",       vars<string>(), "Execute one or more commands at startup")
-        ("exec,e",    vars<string>(), "Execute one or more scrips at startup")
-        ("quit",      po_switch(),    "Quit after startup");
-        ;
-
     po::options_description configs("DataLogger options");
     configs.add_options()
@@ -2471 +2458 @@
         ;
 
-    conf.AddEnv("dns",  "DIM_DNS_NODE");
-    conf.AddEnv("host", "DIM_HOST_NODE");
-
-    conf.AddOptions(configp);
     conf.AddOptions(configs);
 }
@@ -2482 +2465 @@
     Configuration conf(argv[0]);
     conf.SetPrintUsage(PrintUsage);
+    Main::SetupConfiguration(conf);
     SetupConfiguration(conf);