Changeset 13764 for trunk

Timestamp:

05/17/12 20:18:38 (13 years ago)

Author:

tbretz

Message:

Propagate user name.

File:

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

trunk/FACT++/src/dimctrl.cc

@@ -53 +53 @@
     map<string,string> fData;
     string fScript;
+    string fScriptUser;
 
     void ProcessStart()
     {
-        if (!fScript.empty() || fLabel>=0)
+        if (!fScript.empty() || fLabel>-3)
         {
             Error("Script execution still in progress.");
@@ -82 +83 @@
         }
 
+        const auto user = fData.find("user");
+        if (user!=fData.end())
+            fScriptUser = user->second;
+
         if (fDebug)
         {
@@ -95 +100 @@
         if (getCommand()==&fDimStop)
         {
-            Debug("Stop received");
+            const string user = fDimStop.getSize()>0 ? fDimStop.getString() : "";
+
+            string msg = "Stop received";
+            if (!user.empty())
+                msg += " from user '"+user+"'";
+
+            Debug(msg);
             Readline::SetLabel(-2);
         }
@@ -110 +121 @@
                   "|Text[string]:A human readable string sent by the last state change."),
         fDimStart("DIM_CONTROL/START", "C", this),
-        fDimStop("DIM_CONTROL/STOP", "", this)
+        fDimStop("DIM_CONTROL/STOP", "C", this)
     {
     }
@@ -181 +192 @@
 
             msg += ": "+Readline::GetScript()+" [";
-            if (!fUser.empty())
-                msg += fUser+":"+pid.str();
+            if (!fScriptUser.empty())
+                msg += fScriptUser+":"+pid.str();
             msg += "]";
 
@@ -212 +223 @@
         fVerbosity = 90;
 
+        fUser = conf.Get<string>("user");
+        fScriptUser = fUser;
+
         if (conf.Get<bool>("stop"))
-            return Dim::SendCommand("DIM_CONTROL/STOP") + 1;
+            return Dim::SendCommand("DIM_CONTROL/STOP", fUser) + 1;
 
         if (conf.Has("start"))
-            return Dim::SendCommand("DIM_CONTROL/START", conf.Get<string>("start")) + 1;
+            return Dim::SendCommand("DIM_CONTROL/START", conf.Get<string>("start")+" user="+fUser) + 1;
 
         fVerbosity = 40;
@@ -238 +252 @@
 
         fDebug = conf.Get<bool>("debug");
-        fUser  = conf.Get<string>("user");
 
         return -1;
@@ -253 +266 @@
                 Readline::Instance()->Execute(s, fData);
                 fScript = "";
+                fScriptUser = fUser;
             }