Mercurial > hg > orthanc
diff OrthancServer/ServerContext.h @ 2976:cb5d75143da0
Asynchronous generation of ZIP archives and DICOM medias
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 06 Dec 2018 12:23:46 +0100 |
parents | 9c0b0a6d8b54 |
children | 7695a9c81099 |
line wrap: on
line diff
--- a/OrthancServer/ServerContext.h Thu Dec 06 10:10:58 2018 +0100 +++ b/OrthancServer/ServerContext.h Thu Dec 06 12:23:46 2018 +0100 @@ -164,11 +164,13 @@ LuaScripting mainLua_; LuaScripting filterLua_; LuaServerListener luaListener_; - + std::auto_ptr<SharedArchive> mediaArchive_; + // The "JobsEngine" must be *after* "LuaScripting", as // "LuaScripting" embeds "LuaJobManager" that registers as an // observer to "SequenceOfOperationsJob", whose lifetime - // corresponds to that of "JobsEngine" + // corresponds to that of "JobsEngine". It must also be after + // "mediaArchive_", as jobs might access this archive. JobsEngine jobsEngine_; #if ORTHANC_ENABLE_PLUGINS == 1 @@ -189,8 +191,6 @@ std::string defaultLocalAet_; OrthancHttpHandler httpHandler_; - std::auto_ptr<SharedArchive> mediaArchive_; - public: class DicomCacheLocker : public boost::noncopyable {