Changeset 13754 for trunk

Timestamp:

05/16/12 10:05:14 (12 years ago)

Author:

tbretz

Message:

Updated output with the user name.

File:

• trunk/FACT++/src/dimctrl.cc (modified) (2 diffs)

trunk/FACT++/src/dimctrl.cc

@@ -161 +161 @@
         if (txt=="")
         {
+            ostringstream pid;
+            pid << getpid();
+
             fLabel = qos;
 
-            if (fDebug)
-            {
-                string msg;
-                switch (fLabel)
-                {
-                case -3: msg = Line("End ["+Readline::GetScript()+"]", '=');   break;
-                case -2: msg = Line("Load ["+Readline::GetScript()+"]", '=');  break;
-                case -1: msg = Line("Begin ["+Readline::GetScript()+"]", '-'); break;
-                default:
-                    {
-                        ostringstream out;
-                        out << "Label " << fLabel << " [" << Readline::GetScript() << "]";
-                        msg = Line(out.str(), '-');
-                    }
-                }
-
-                MessageDimTX::Write(time, msg, 90);
-            }
-
-            fSrvState.setQuality(fLabel);
+            string msg;
             switch (fLabel)
             {
-            case -3: return fSrvState.Update(Readline::GetScript()+" [end]");
-            case -2: return fSrvState.Update(Readline::GetScript()+" [load]");
-            case -1: return fSrvState.Update(Readline::GetScript()+" [start]");
+            case -3: msg = "End";   break;
+            case -2: msg = "Load";  break;
+            case -1: msg = "Begin"; break;
+            default:
+                {
+                    ostringstream out;
+                    out << "Label " << fLabel;
+                    msg = out.str();
+                }
             }
 
-            ostringstream msg;
-            msg << Readline::GetScript() << " [" << fLabel << "]";
-            return fSrvState.Update(msg.str());
+            msg += ": "+Readline::GetScript()+" [";
+            if (!fUser.empty())
+                msg += fUser+":"+pid.str();
+            msg += "]";
+
+            if (fDebug)
+                MessageDimTX::Write(time, Line(msg, fLabel<-1 ? '=' :'-'), 90);
+
+            fSrvState.setQuality(fLabel);
+            return fSrvState.Update(msg);
         }
 
@@ -271 +268 @@
         ("quiet,q",     po_bool(false),  "Suppress all output except comments (log-level>=90)")
         ("debug",       po_bool(false),  "Print the labels for debugging purpose")
-        ("start",       var<string>(),   "")
-        ("stop",        po_switch(),     "")
-        ("user,u",      var<string>(),   "A user name - just for logging purposes")
+        ("start",       var<string>(),   "Start a script with the given name at the given label (script.dim[:N])")
+        ("stop",        po_switch(),     "Stop a currently running script")
+        ("user,u",      var<string>(""), "A user name - just for logging purposes (default is ${USER})")
         ;
+
+    conf.AddEnv("user", "USER");
 
     conf.AddOptions(control);