[FIXES] After testing

Author: pwielders

Launcher.cpp

@@ -5,6 +5,7 @@ namespace Plugin {
 
 SERVICE_REGISTRATION(Launcher, 1, 0);
 
+/* static */ Launcher::ProcessObserver Launcher::_observer;
 
 /* virtual */ const string Launcher::Initialize(PluginHost::IShell* service)
 {
@@ -16,18 +17,54 @@ SERVICE_REGISTRATION(Launcher, 1, 0);
     // Setup skip URL for right offset.
     _service = service;
 
-    
     config.FromString(_service->ConfigLine());
+
+    _closeTime = (config.CloseTime.Value());
     Core::Process::Options options(config.Command.Value().c_str());
     auto iter = config.Parameters.Elements();
 
-    return message;
+    while (iter.Next() == true) {
+        const Config::Parameter& element(iter.Current());
+
+        if ((element.Option.IsSet() == true) && (element.Option.Value().empty() == false)) {
+            if ((element.Value.IsSet() == true) && (element.Value.Value().empty() == false)) {
+                options.Set(element.Option.Value(), element.Value.Value());
+            }
+            else {
+                options.Set(element.Option.Value());
+            }
+        }
+    }
+
+    _observer.Register(&_notification);
+
+    // Well if we where able to parse the parameters (if needed) we are ready to start it..
+    _process.Launch(options, &_pid);
+
+    if (_pid == 0) {
+        _observer.Unregister(&_notification);
+        message = _T("Could not spawn the requested app/script [") + config.Command.Value() + ']';
+    }
+
+    return (message);
 }
 
 /* virtual */ void Launcher::Deinitialize(PluginHost::IShell* service)
 {
     ASSERT(_service == service);
 
+    _observer.Unregister(&_notification);
+
+    if (_process.IsActive() == true) {
+        // First try a gentle touch....
+        _process.Kill(false);
+
+        // Wait for a maximum of 3 Seconds before we shoot the process!!
+        if (_process.WaitProcessCompleted(_closeTime * 1000) != Core::ERROR_NONE) {
+            _process.Kill(true);
+        }
+    }
+
     _service = nullptr;
 }
 
@@ -41,9 +78,19 @@ void Launcher::Update(const ProcessObserver::Info& info)
 {
     // This can potentially be called on a socket thread, so the deactivation (wich in turn kills this object) must be done
     // on a seperate thread. Also make sure this call-stack can be unwound before we are totally destructed.
-    if (_process.Id() == info.Id()) {
+    if (_pid == info.Id()) {
+
         ASSERT(_service != nullptr);
-        PluginHost::WorkerPool::Instance().Submit(PluginHost::IShell::Job::Create(_service, PluginHost::IShell::DEACTIVATED, PluginHost::IShell::FAILURE));
+
+        if (info.Event() == ProcessObserver::Info::EVENT_EXIT) {
+        
+            if ((info.ExitCode() & 0xFFFF) == 0) {
+                PluginHost::WorkerPool::Instance().Submit(PluginHost::IShell::Job::Create(_service, PluginHost::IShell::DEACTIVATED, PluginHost::IShell::AUTOMATIC));
+            }
+            else {
+                PluginHost::WorkerPool::Instance().Submit(PluginHost::IShell::Job::Create(_service, PluginHost::IShell::DEACTIVATED, PluginHost::IShell::FAILURE));
+            }
+        }
     }
 }
 

Launcher.h

@@ -37,7 +37,7 @@ class Launcher : public PluginHost::IPlugin {
             Info(const uint8_t buffer[], const uint16_t length) 
                 : _status(PROC_CN_MCAST_IGNORE) {
                 if (Ingest(buffer, length) == false) {
-                    printf("This failed !!!!\n");
+                    TRACE_L1("This failed !!!!\n");
                     _info.what = proc_event::PROC_EVENT_NONE;
                 }
             }
@@ -129,7 +129,7 @@ class Launcher : public PluginHost::IPlugin {
 
         public:
             Channel(ProcessObserver& parent) 
-                : Core::SocketNetlink(Core::NodeId(NETLINK_CONNECTOR, ::getpid(), CN_IDX_PROC))
+                : Core::SocketNetlink(Core::NodeId(NETLINK_CONNECTOR, 0, CN_IDX_PROC))
                 , _parent(parent) {
             }
             virtual ~Channel() {
@@ -179,37 +179,34 @@ class Launcher : public PluginHost::IPlugin {
             auto found = std::find(_callbacks.begin(), _callbacks.end(), observer);
             ASSERT(found != _callbacks.end());
             _callbacks.erase(found); 
-            if (_callbacks.empty())
+            if (_callbacks.empty()) {
                 Close();
+            }
             _adminLock.Unlock();
         }
 
     private:
         bool Open() {
-            bool succeeded = (_channel.IsOpen() == true);
+            bool succeeded = true;
+            ASSERT (_channel.IsOpen() == false);
 
-            if ((succeeded == false) && (_channel.Open(Core::infinite) == Core::ERROR_NONE)) {
+            if (_channel.Open(Core::infinite) == Core::ERROR_NONE) {
                 Info message(true);
 
                 if (_channel.Send(message, Core::infinite) != Core::ERROR_NONE) {
                     _channel.Close(Core::infinite);
-                }
-                else {
-                    succeeded = true;
+                    succeeded = false;
                 }
             }
             return (succeeded);
         }
         bool Close() {
-            bool succeeded = (_channel.IsOpen() == false);
-
-            if (succeeded == false) {
+            if (_channel.IsOpen() == true) {
 
                 Info message(false);
                 _channel.Send (message, Core::infinite);
-                _channel.Close(Core::infinite);
-                succeeded = true;
             }
+            _channel.Close(Core::infinite);
 
             return (Core::ERROR_NONE);
         }
@@ -260,11 +257,16 @@ class Launcher : public PluginHost::IPlugin {
         Launcher& _parent;
     };
 
+public:
     class Config : public Core::JSON::Container {
     private:
+        Config(const Config&) = delete;
+        Config& operator=(const Config&) = delete;
+
+    public:
         class Parameter : public Core::JSON::Container {
         private:
-            Parameter& operator=(const Parameter&);
+            Parameter& operator=(const Parameter&) = delete;
 
         public:
             Parameter()
@@ -289,17 +291,16 @@ class Launcher : public PluginHost::IPlugin {
             Core::JSON::String Value;
         };
 
-        Config(const Config&);
-        Config& operator=(const Config&);
-
     public:
         Config()
             : Core::JSON::Container()
             , Command()
             , Parameters()
+            , CloseTime(3)
         {
             Add(_T("command"), &Command);
             Add(_T("parameters"), &Parameters);
+            Add(_T("closetime"), &CloseTime);
         }
         ~Config()
         {
@@ -308,6 +309,7 @@ class Launcher : public PluginHost::IPlugin {
     public:
         Core::JSON::String Command;
         Core::JSON::ArrayType<Parameter> Parameters;
+        Core::JSON::DecUInt8 CloseTime;
     };
 
 public:
@@ -317,6 +319,8 @@ class Launcher : public PluginHost::IPlugin {
     Launcher()
         : _service(nullptr)
         , _process(false)
+        , _pid(0)
+        , _closeTime(0)
         , _notification(this)
     {
     }
@@ -359,8 +363,11 @@ class Launcher : public PluginHost::IPlugin {
 private:
     PluginHost::IShell* _service;
     Core::Process _process;
-    static ProcessObserver _observer;
+    uint32_t _pid;
+    uint8_t _closeTime;
     Core::Sink<Notification> _notification;
+
+    static ProcessObserver _observer;
 };
 
 } //namespace Plugin