diff OrthancServer/ServerJobs/LuaJobManager.cpp @ 2608:25225f0b4f33 jobs

simplification wrt. dicom connection manager
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 19 May 2018 15:50:09 +0200
parents 44e268605478
children f7a84b551ee4
line wrap: on
line diff
--- a/OrthancServer/ServerJobs/LuaJobManager.cpp	Sat May 19 15:28:41 2018 +0200
+++ b/OrthancServer/ServerJobs/LuaJobManager.cpp	Sat May 19 15:50:09 2018 +0200
@@ -47,16 +47,6 @@
 
 namespace Orthanc
 {
-  void LuaJobManager::ConnectionTimeoutThread(LuaJobManager* manager)
-  {
-    while (manager->continue_)
-    {
-      manager->connectionManager_.CheckTimeout();
-      boost::this_thread::sleep(boost::posix_time::milliseconds(100));
-    }
-  }
-
-    
   void LuaJobManager::SignalDone(const SequenceOfOperationsJob& job)
   {
     boost::mutex::scoped_lock lock(mutex_);
@@ -72,21 +62,8 @@
   LuaJobManager::LuaJobManager() :
     currentJob_(NULL),
     maxOperations_(1000),
-    priority_(0),
-    continue_(true)
+    priority_(0)
   {
-    connectionTimeoutThread_ = boost::thread(ConnectionTimeoutThread, this);
-  }
-
-
-  LuaJobManager::~LuaJobManager()
-  {
-    continue_ = false;
-
-    if (connectionTimeoutThread_.joinable())
-    {
-      connectionTimeoutThread_.join();
-    }
   }
 
 
@@ -180,8 +157,7 @@
                                                    const RemoteModalityParameters& modality)
   {
     assert(jobLock_.get() != NULL);
-    return jobLock_->AddOperation
-      (new StoreScuOperation(localAet, modality, that_.connectionManager_));    
+    return jobLock_->AddOperation(new StoreScuOperation(localAet, modality));    
   }