comparison OrthancServer/ServerIndex.cpp @ 2943:9f6716008066

merge
author am@osimis.io
date Thu, 29 Nov 2018 15:26:47 +0100
parents 4767d36679ed
children 96089d1aba4d
comparison
equal deleted inserted replaced
2942:e9613a09cf9e 2943:9f6716008066
38 #define NOMINMAX 38 #define NOMINMAX
39 #endif 39 #endif
40 40
41 #include "ServerIndexChange.h" 41 #include "ServerIndexChange.h"
42 #include "EmbeddedResources.h" 42 #include "EmbeddedResources.h"
43 #include "OrthancInitialization.h" 43 #include "OrthancConfiguration.h"
44 #include "../Core/DicomParsing/ParsedDicomFile.h" 44 #include "../Core/DicomParsing/ParsedDicomFile.h"
45 #include "ServerToolbox.h" 45 #include "ServerToolbox.h"
46 #include "../Core/Toolbox.h" 46 #include "../Core/Toolbox.h"
47 #include "../Core/Logging.h" 47 #include "../Core/Logging.h"
48 #include "../Core/DicomFormat/DicomArray.h" 48 #include "../Core/DicomFormat/DicomArray.h"
1929 1929
1930 1930
1931 void ServerIndex::UnstableResourcesMonitorThread(ServerIndex* that, 1931 void ServerIndex::UnstableResourcesMonitorThread(ServerIndex* that,
1932 unsigned int threadSleep) 1932 unsigned int threadSleep)
1933 { 1933 {
1934 int stableAge = Configuration::GetGlobalUnsignedIntegerParameter("StableAge", 60); 1934 int stableAge;
1935
1936 {
1937 OrthancConfiguration::ReaderLock lock;
1938 stableAge = lock.GetConfiguration().GetUnsignedIntegerParameter("StableAge", 60);
1939 }
1940
1935 if (stableAge <= 0) 1941 if (stableAge <= 0)
1936 { 1942 {
1937 stableAge = 60; 1943 stableAge = 60;
1938 } 1944 }
1939 1945