Mercurial > hg > orthanc

comparison OrthancServer/ServerContext.h @ 2980:63b724c7b046

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author am@osimis.io
date Thu, 06 Dec 2018 13:10:24 +0100
parents cb5d75143da0
children 7695a9c81099
comparison
equal deleted inserted replaced
2979:5947aeedf41f 2980:63b724c7b046
162 MemoryCache dicomCache_; 162 MemoryCache dicomCache_;
163 163
164 LuaScripting mainLua_; 164 LuaScripting mainLua_;
165 LuaScripting filterLua_; 165 LuaScripting filterLua_;
166 LuaServerListener luaListener_; 166 LuaServerListener luaListener_;
167 167 std::auto_ptr<SharedArchive> mediaArchive_;
168
168 // The "JobsEngine" must be *after* "LuaScripting", as 169 // The "JobsEngine" must be *after* "LuaScripting", as
169 // "LuaScripting" embeds "LuaJobManager" that registers as an 170 // "LuaScripting" embeds "LuaJobManager" that registers as an
170 // observer to "SequenceOfOperationsJob", whose lifetime 171 // observer to "SequenceOfOperationsJob", whose lifetime
171 // corresponds to that of "JobsEngine" 172 // corresponds to that of "JobsEngine". It must also be after
173 // "mediaArchive_", as jobs might access this archive.
172 JobsEngine jobsEngine_; 174 JobsEngine jobsEngine_;
173 175
174 #if ORTHANC_ENABLE_PLUGINS == 1 176 #if ORTHANC_ENABLE_PLUGINS == 1
175 OrthancPlugins* plugins_; 177 OrthancPlugins* plugins_;
176 #endif 178 #endif
187 189
188 std::auto_ptr<SharedArchive> queryRetrieveArchive_; 190 std::auto_ptr<SharedArchive> queryRetrieveArchive_;
189 std::string defaultLocalAet_; 191 std::string defaultLocalAet_;
190 OrthancHttpHandler httpHandler_; 192 OrthancHttpHandler httpHandler_;
191 193
192 std::auto_ptr<SharedArchive> mediaArchive_;
193
194 public: 194 public:
195 class DicomCacheLocker : public boost::noncopyable 195 class DicomCacheLocker : public boost::noncopyable
196 { 196 {
197 private: 197 private:
198 ServerContext& that_; 198 ServerContext& that_;