orthanc: OrthancServer/OrthancInitialization.cpp comparison

comparison OrthancServer/OrthancInitialization.cpp @ 1892:0001f8cd7849

Warn about badly formatted modality/peer definitions in configuration file at startup

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Mon, 14 Dec 2015 10:10:50 +0100
parents	53e045b5a8ec
children	b1291df2f780

comparison

equal deleted inserted replaced

-:b465506eb028
+:0001f8cd7849
 #endif
 namespace Orthanc
 {
-static boost::mutex globalMutex_;
+static boost::recursive_mutex globalMutex_;
 static Json::Value configuration_;
 static boost::filesystem::path defaultDirectory_;
 static std::string configurationAbsolutePath_;
 static FontRegistry fontRegistry_;
 p /= "Configuration.json";
 configurationAbsolutePath_ = boost::filesystem::absolute(p).string();
 AddFileToConfiguration(p);
 #endif
+}
+}
+static void ValidateGlobalConfiguration()
+{
+std::set<std::string> ids;
+Configuration::GetListOfOrthancPeers(ids);
+for (std::set<std::string>::const_iterator it = ids.begin(); it != ids.end(); ++it)
+{
+OrthancPeerParameters peer;
+Configuration::GetOrthancPeer(peer, *it);
+}
+Configuration::GetListOfDicomModalities(ids);
+for (std::set<std::string>::const_iterator it = ids.begin(); it != ids.end(); ++it)
+{
+RemoteModalityParameters modality;
+Configuration::GetDicomModalityUsingSymbolicName(modality, *it);
 }
 }
 static void RegisterUserMetadata()
 void OrthancInitialize(const char* configurationFile)
 {
-boost::mutex::scoped_lock lock(globalMutex_);
+boost::recursive_mutex::scoped_lock lock(globalMutex_);
 #if ORTHANC_SSL_ENABLED == 1
 // https://wiki.openssl.org/index.php/Library_Initialization
 SSL_library_init();
 SSL_load_error_strings();
 InitializeServerEnumerations();
 // Read the user-provided configuration
 ReadGlobalConfiguration(configurationFile);
+ValidateGlobalConfiguration();
 HttpClient::GlobalInitialize(GetGlobalBoolParameterInternal("HttpsVerifyPeers", true),
 GetGlobalStringParameterInternal("HttpsCACertificates", ""));
 RegisterUserMetadata();
 void OrthancFinalize()
 {
-boost::mutex::scoped_lock lock(globalMutex_);
+boost::recursive_mutex::scoped_lock lock(globalMutex_);
 HttpClient::GlobalFinalize();
 #if ORTHANC_JPEG_LOSSLESS_ENABLED == 1
 // Unregister JPEG-LS codecs
 DJLSDecoderRegistration::cleanup();
 std::string Configuration::GetGlobalStringParameter(const std::string& parameter,
 const std::string& defaultValue)
 {
-boost::mutex::scoped_lock lock(globalMutex_);
+boost::recursive_mutex::scoped_lock lock(globalMutex_);
 return GetGlobalStringParameterInternal(parameter, defaultValue);
 }
 int Configuration::GetGlobalIntegerParameter(const std::string& parameter,
 int defaultValue)
 {
-boost::mutex::scoped_lock lock(globalMutex_);
+boost::recursive_mutex::scoped_lock lock(globalMutex_);
 if (configuration_.isMember(parameter))
 {
 if (configuration_[parameter].type() != Json::intValue)
 {
 bool Configuration::GetGlobalBoolParameter(const std::string& parameter,
 bool defaultValue)
 {
-boost::mutex::scoped_lock lock(globalMutex_);
+boost::recursive_mutex::scoped_lock lock(globalMutex_);
 return GetGlobalBoolParameterInternal(parameter, defaultValue);
 }
 void Configuration::GetDicomModalityUsingSymbolicName(RemoteModalityParameters& modality,
 const std::string& name)
 {
-boost::mutex::scoped_lock lock(globalMutex_);
+boost::recursive_mutex::scoped_lock lock(globalMutex_);
 if (!configuration_.isMember("DicomModalities"))
 {
 LOG(ERROR) << "No modality with symbolic name: " << name;
 throw OrthancException(ErrorCode_InexistentItem);
 void Configuration::GetOrthancPeer(OrthancPeerParameters& peer,
 const std::string& name)
 {
-boost::mutex::scoped_lock lock(globalMutex_);
+boost::recursive_mutex::scoped_lock lock(globalMutex_);
 if (!configuration_.isMember("OrthancPeers"))
 {
 LOG(ERROR) << "No peer with symbolic name: " << name;
 throw OrthancException(ErrorCode_InexistentItem);
 static bool ReadKeys(std::set<std::string>& target,
 const char* parameter,
 bool onlyAlphanumeric)
 {
-boost::mutex::scoped_lock lock(globalMutex_);
+boost::recursive_mutex::scoped_lock lock(globalMutex_);
 target.clear();
 if (!configuration_.isMember(parameter))
 {
 }
 void Configuration::GetListOfDicomModalities(std::set<std::string>& target)
 {
+target.clear();
 if (!ReadKeys(target, "DicomModalities", true))
 {
 LOG(ERROR) << "Only alphanumeric and dash characters are allowed in the names of the modalities";
 throw OrthancException(ErrorCode_BadFileFormat);
 }
 }
 void Configuration::GetListOfOrthancPeers(std::set<std::string>& target)
 {
+target.clear();
 if (!ReadKeys(target, "OrthancPeers", true))
 {
 LOG(ERROR) << "Only alphanumeric and dash characters are allowed in the names of Orthanc peers";
 throw OrthancException(ErrorCode_BadFileFormat);
 }
 void Configuration::SetupRegisteredUsers(MongooseServer& httpServer)
 {
-boost::mutex::scoped_lock lock(globalMutex_);
+boost::recursive_mutex::scoped_lock lock(globalMutex_);
 httpServer.ClearUsers();
 if (!configuration_.isMember("RegisteredUsers"))
 {
 }
 }
 std::string Configuration::InterpretStringParameterAsPath(const std::string& parameter)
 {
-boost::mutex::scoped_lock lock(globalMutex_);
+boost::recursive_mutex::scoped_lock lock(globalMutex_);
 return InterpretRelativePath(defaultDirectory_.string(), parameter);
 }
 void Configuration::GetGlobalListOfStringsParameter(std::list<std::string>& target,
 const std::string& key)
 {
-boost::mutex::scoped_lock lock(globalMutex_);
+boost::recursive_mutex::scoped_lock lock(globalMutex_);
 target.clear();
 if (!configuration_.isMember(key))
 {
 void Configuration::UpdateModality(const std::string& symbolicName,
 const RemoteModalityParameters& modality)
 {
-boost::mutex::scoped_lock lock(globalMutex_);
+boost::recursive_mutex::scoped_lock lock(globalMutex_);
 if (!configuration_.isMember("DicomModalities"))
 {
 configuration_["DicomModalities"] = Json::objectValue;
 }
 }
 void Configuration::RemoveModality(const std::string& symbolicName)
 {
-boost::mutex::scoped_lock lock(globalMutex_);
+boost::recursive_mutex::scoped_lock lock(globalMutex_);
 if (!configuration_.isMember("DicomModalities"))
 {
 LOG(ERROR) << "No modality with symbolic name: " << symbolicName;
 throw OrthancException(ErrorCode_BadFileFormat);
 void Configuration::UpdatePeer(const std::string& symbolicName,
 const OrthancPeerParameters& peer)
 {
-boost::mutex::scoped_lock lock(globalMutex_);
+boost::recursive_mutex::scoped_lock lock(globalMutex_);
 if (!configuration_.isMember("OrthancPeers"))
 {
 LOG(ERROR) << "No peer with symbolic name: " << symbolicName;
 configuration_["OrthancPeers"] = Json::objectValue;
 }
 void Configuration::RemovePeer(const std::string& symbolicName)
 {
-boost::mutex::scoped_lock lock(globalMutex_);
+boost::recursive_mutex::scoped_lock lock(globalMutex_);
 if (!configuration_.isMember("OrthancPeers"))
 {
 LOG(ERROR) << "No peer with symbolic name: " << symbolicName;
 throw OrthancException(ErrorCode_BadFileFormat);
 }
 void Configuration::GetConfiguration(Json::Value& result)
 {
-boost::mutex::scoped_lock lock(globalMutex_);
+boost::recursive_mutex::scoped_lock lock(globalMutex_);
 result = configuration_;
 }
 void Configuration::FormatConfiguration(std::string& result)

Mercurial > hg > orthanc

comparison OrthancServer/OrthancInitialization.cpp @ 1892:0001f8cd7849