Mercurial > hg > orthanc
comparison OrthancServer/main.cpp @ 2946:2e751f615e03
new configuration options: DicomModalitiesInDatabase and OrthancPeersInDatabase
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Thu, 29 Nov 2018 17:15:29 +0100 |
parents | e292798f9980 |
children | dc18d5804746 |
comparison
equal
deleted
inserted
replaced
2945:3c636087d060 | 2946:2e751f615e03 |
---|---|
734 restart = true; | 734 restart = true; |
735 break; | 735 break; |
736 } | 736 } |
737 else | 737 else |
738 { | 738 { |
739 LOG(WARNING) << "A SIGHUP signal has been received, but is ignored as the configuration has not changed"; | 739 LOG(WARNING) << "A SIGHUP signal has been received, but is ignored " |
740 << "as the configuration has not changed on the disk"; | |
740 Logging::Flush(); | 741 Logging::Flush(); |
741 continue; | 742 continue; |
742 } | 743 } |
743 } | 744 } |
744 else | 745 else |
1129 (lock.GetConfiguration().GetUnsignedIntegerParameter("JobsHistorySize", 10)); | 1130 (lock.GetConfiguration().GetUnsignedIntegerParameter("JobsHistorySize", 10)); |
1130 } | 1131 } |
1131 | 1132 |
1132 { | 1133 { |
1133 ServerContextConfigurator configurator(context, plugins); | 1134 ServerContextConfigurator configurator(context, plugins); |
1135 | |
1136 { | |
1137 OrthancConfiguration::WriterLock lock; | |
1138 lock.GetConfiguration().LoadModalitiesAndPeers(); | |
1139 } | |
1140 | |
1134 return ConfigureHttpHandler(context, plugins, loadJobsFromDatabase); | 1141 return ConfigureHttpHandler(context, plugins, loadJobsFromDatabase); |
1135 } | 1142 } |
1136 } | 1143 } |
1137 | 1144 |
1138 | 1145 |