control of internal services lifetime moved from InternalAppContext i…

…nto InternalApplication
ITpC · Jul 16, 2018 · 9cbe03d · 9cbe03d
1 parent 080bbb1
commit 9cbe03d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 7 deletions.
diff --git a/include/InternalAppContext.h b/include/InternalAppContext.h
@@ -62,9 +62,11 @@ namespace LAppS
 {
   class InternalAppContext : public ::abstract::ApplicationContext
   {
+  public:
+   std::atomic<bool> mCanStop;
   private:
     std::atomic<bool> mMustStop;
-    std::atomic<bool> mCanStop;
+
     const bool isInternalAppValid() const
     {
       bool ret=false;
@@ -96,7 +98,7 @@ namespace LAppS
   public:
 
     InternalAppContext(const std::string& name):
-    ::abstract::ApplicationContext(name), mMustStop{false},mCanStop{false}
+    ::abstract::ApplicationContext(name), mCanStop{false}, mMustStop{false}
     {
       luaL_openlibs(mLState);
 
@@ -171,11 +173,6 @@ namespace LAppS
     ~InternalAppContext() noexcept
     {
       this->stop();
-      itc::sys::Nap waithere;
-      while(!mCanStop)
-      {
-        waithere.usleep(10000);
-      }
     }
   };
 }

diff --git a/include/InternalApplication.h b/include/InternalApplication.h
@@ -72,7 +72,16 @@ namespace LAppS
     }
     void shutdown()
     {
+      itc::getLog()->info(__FILE__,__LINE__,"Shutdown is requested for an instance %ul  of the internal application %s",mInstanceID, mContext.getName().c_str());
       mContext.stop();
+
+      itc::sys::Nap waithere;
+
+      while(!mContext.mCanStop.load())
+      {
+        waithere.usleep(10000);
+      }
+
       itc::getLog()->info(__FILE__,__LINE__,"Instance %ul  of an internal application %s is down",mInstanceID, mContext.getName().c_str());
     }
   };