Changeset 18167

Timestamp:

04/10/15 12:12:34 (10 years ago)

Author:

tbretz

Message:

Print not only the identification of the script but also the user who sent the STOP command.

Location:

trunk/FACT++/src

Files:

• StateMachineDimControl.cc (modified) (2 diffs)
• StateMachineDimControl.h (modified) (1 diff)

trunk/FACT++/src/StateMachineDimControl.cc

@@ -123 +123 @@
 }
 
-int StateMachineDimControl::StopScript()
-{
-    Info("Stop received.");
+int StateMachineDimControl::StopScript(const EventImp &imp)
+{
+    const string str(imp.GetString());
+
+    string msg("Stop received");
+    msg += str.empty() ? "." : " ["+str+"]";
+
+    Info(msg);
 
     Readline::StopScript();
@@ -529 +534 @@
 
     AddEvent("STOP", "C")
-        (bind(&StateMachineDimControl::StopScript, this))
+        (bind(&StateMachineDimControl::StopScript, this, placeholders::_1))
         ("Stop a runnning batch script or JavaScript");
 

trunk/FACT++/src/StateMachineDimControl.h

@@ -47 +47 @@
 
     int StartScript(const EventImp &imp, const std::string &cmd);
-    int StopScript();
+    int StopScript(const EventImp &imp);
     int InterruptScript(const EventImp &imp);