Mercurial > hg > orthanc

comparison OrthancServer/OrthancInitialization.cpp @ 457:997282a61ff8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleaner names
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 04 Jul 2013 16:00:13 +0200
parents 081a44d5110b
children 4aae0261515e
comparison
equal deleted inserted replaced
456:511efa5c84dd 457:997282a61ff8
30 **/ 30 **/
31 31
32 32
33 #include "OrthancInitialization.h" 33 #include "OrthancInitialization.h"
34 34
35 #include "../OrthancCppClient/HttpClient.h"
35 #include "../Core/OrthancException.h" 36 #include "../Core/OrthancException.h"
36 #include "../Core/Toolbox.h" 37 #include "../Core/Toolbox.h"
37 #include "ServerEnumerations.h" 38 #include "ServerEnumerations.h"
38 39
39 #include <boost/lexical_cast.hpp> 40 #include <boost/lexical_cast.hpp>
159 160
160 InitializeServerEnumerations(); 161 InitializeServerEnumerations();
161 defaultDirectory_ = boost::filesystem::current_path(); 162 defaultDirectory_ = boost::filesystem::current_path();
162 ReadGlobalConfiguration(configurationFile); 163 ReadGlobalConfiguration(configurationFile);
163 164
164 curl_global_init(CURL_GLOBAL_ALL); 165 HttpClient::GlobalInitialize();
165 166
166 RegisterUserMetadata(); 167 RegisterUserMetadata();
167 } 168 }
168 169
169 170
170 171
171 void OrthancFinalize() 172 void OrthancFinalize()
172 { 173 {
173 boost::mutex::scoped_lock lock(globalMutex_); 174 boost::mutex::scoped_lock lock(globalMutex_);
174 curl_global_cleanup(); 175 HttpClient::GlobalFinalize();
175 configuration_.reset(NULL); 176 configuration_.reset(NULL);
176 } 177 }
177 178
178 179
179 180