Mercurial > hg > orthanc
changeset 774:4e3593c3511d
NEWS
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 30 Apr 2014 15:17:10 +0200 |
| parents | 3bd0589af992 |
| children | d3ba35466225 be87dd517416 |
| files | NEWS OrthancServer/DicomProtocol/ReusableDicomUserConnection.cpp OrthancServer/ServerContext.cpp OrthancServer/main.cpp |
| diffstat | 4 files changed, 5 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS Wed Apr 30 15:08:51 2014 +0200 +++ b/NEWS Wed Apr 30 15:17:10 2014 +0200 @@ -1,6 +1,7 @@ Pending changes in the mainline =============================== +* Reuse of the previous SCU connection to avoid unecessary handshakes * Dynamic negotiation of SOP classes for C-Store SCU * Fix missing licensing terms about reuse of some DCMTK code
--- a/OrthancServer/DicomProtocol/ReusableDicomUserConnection.cpp Wed Apr 30 15:08:51 2014 +0200 +++ b/OrthancServer/DicomProtocol/ReusableDicomUserConnection.cpp Wed Apr 30 15:17:10 2014 +0200 @@ -86,7 +86,7 @@ boost::this_thread::sleep(boost::posix_time::milliseconds(100)); if (!that->continue_) { - LOG(INFO) << "Finishing the thread watching the global SCU connection"; + //LOG(INFO) << "Finishing the thread watching the global SCU connection"; return; }
--- a/OrthancServer/ServerContext.cpp Wed Apr 30 15:08:51 2014 +0200 +++ b/OrthancServer/ServerContext.cpp Wed Apr 30 15:17:10 2014 +0200 @@ -67,6 +67,8 @@ dicomCache_(provider_, DICOM_CACHE_SIZE) { scu_.SetLocalApplicationEntityTitle(GetGlobalStringParameter("DicomAet", "ORTHANC")); + //scu_.SetMillisecondsBeforeClose(1); // The connection is always released + lua_.Execute(Orthanc::EmbeddedResources::LUA_TOOLBOX); }
--- a/OrthancServer/main.cpp Wed Apr 30 15:08:51 2014 +0200 +++ b/OrthancServer/main.cpp Wed Apr 30 15:17:10 2014 +0200 @@ -41,7 +41,7 @@ #include "../Core/Lua/LuaFunctionCall.h" #include "../Core/DicomFormat/DicomArray.h" #include "DicomProtocol/DicomServer.h" -#include "DicomProtocol/DicomUserConnection.h" +#include "DicomProtocol/ReusableDicomUserConnection.h" #include "OrthancInitialization.h" #include "ServerContext.h" #include "OrthancFindRequestHandler.h"