Mercurial > hg > orthanc

comparison OrthancServer/ServerJobs/LuaJobManager.cpp @ 3851:6498739a3c3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
refactoring: TimeoutDicomConnectionManager is now only used by Lua
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 20 Apr 2020 16:46:44 +0200
parents 94f4a18a79cc
children 8f7ad4989fec
comparison
equal deleted inserted replaced
3850:d729d6e8b484 3851:6498739a3c3c
66 currentJob_(NULL), 66 currentJob_(NULL),
67 maxOperations_(1000), 67 maxOperations_(1000),
68 priority_(0), 68 priority_(0),
69 trailingTimeout_(5000) 69 trailingTimeout_(5000)
70 { 70 {
71 unsigned int dicomTimeout;
72
71 { 73 {
72 OrthancConfiguration::ReaderLock lock; 74 OrthancConfiguration::ReaderLock lock;
73 dicomTimeout_ = lock.GetConfiguration().GetUnsignedIntegerParameter("DicomAssociationCloseDelay", 5); 75 dicomTimeout = lock.GetConfiguration().GetUnsignedIntegerParameter("DicomAssociationCloseDelay", 5);
74 } 76 }
75 77
78 connectionManager_.SetInactivityTimeout(dicomTimeout * 1000); // Milliseconds expected
76 LOG(INFO) << "Lua: DICOM associations will be closed after " 79 LOG(INFO) << "Lua: DICOM associations will be closed after "
77 << dicomTimeout_ << " seconds of inactivity"; 80 << dicomTimeout << " seconds of inactivity";
78 } 81 }
79 82
80 83
81 void LuaJobManager::SetMaxOperationsPerJob(size_t count) 84 void LuaJobManager::SetMaxOperationsPerJob(size_t count)
82 { 85 {
147 that_.currentJob_->SetDescription("Lua"); 150 that_.currentJob_->SetDescription("Lua");
148 151
149 { 152 {
150 jobLock_.reset(new SequenceOfOperationsJob::Lock(*that_.currentJob_)); 153 jobLock_.reset(new SequenceOfOperationsJob::Lock(*that_.currentJob_));
151 jobLock_->SetTrailingOperationTimeout(that_.trailingTimeout_); 154 jobLock_->SetTrailingOperationTimeout(that_.trailingTimeout_);
152 jobLock_->SetDicomAssociationTimeout(that_.dicomTimeout_ * 1000); // Milliseconds expected
153 } 155 }
154 } 156 }
155 157
156 assert(jobLock_.get() != NULL); 158 assert(jobLock_.get() != NULL);
157 } 159 }
200 202
201 size_t LuaJobManager::Lock::AddStoreScuOperation(const std::string& localAet, 203 size_t LuaJobManager::Lock::AddStoreScuOperation(const std::string& localAet,
202 const RemoteModalityParameters& modality) 204 const RemoteModalityParameters& modality)
203 { 205 {
204 assert(jobLock_.get() != NULL); 206 assert(jobLock_.get() != NULL);
205 return jobLock_->AddOperation(new StoreScuOperation(localAet, modality)); 207 return jobLock_->AddOperation(new StoreScuOperation(that_.connectionManager_, localAet, modality));
206 } 208 }
207 209
208 210
209 size_t LuaJobManager::Lock::AddStorePeerOperation(const WebServiceParameters& peer) 211 size_t LuaJobManager::Lock::AddStorePeerOperation(const WebServiceParameters& peer)
210 { 212 {