orthanc: OrthancFramework/Sources/HttpServer/HttpServer.cpp comparison

comparison OrthancFramework/Sources/HttpServer/HttpServer.cpp @ 4295:90f91b78d708

applied log categories

author	Alain Mazy <alain@mazy.be>
date	Thu, 05 Nov 2020 12:01:11 +0100
parents	0923247e69f6
children	db3932f9660d

comparison

equal deleted inserted replaced

-:0923247e69f6
+:90f91b78d708
 if (overriden.size() > 0)
 {
 // A faking has been done within this request
 Toolbox::ToUpperCase(overriden);
-LOG(INFO) << "HTTP method faking has been detected for " << overriden;
+CLOG(INFO, HTTP) << "HTTP method faking has been detected for " << overriden;
 if (overriden == "PUT")
 {
 method = HttpMethod_Put;
 return true;
 #  if CIVETWEB_HAS_WEBDAV_WRITING == 0
 static void AnswerWebDavReadOnly(HttpOutput& output,
 const std::string& uri)
 {
-LOG(ERROR) << "Orthanc was compiled without support for read-write access to WebDAV: " << uri;
+CLOG(ERROR, HTTP) << "Orthanc was compiled without support for read-write access to WebDAV: " << uri;
 output.SendStatus(HttpStatus_403_Forbidden);
 }
 #  endif
 static bool HandleWebDav(HttpOutput& output,
 output.SendStatus(HttpStatus_403_Forbidden);
 }
 }
 else
 {
-LOG(ERROR) << "Cannot read the content of a file to be stored in WebDAV";
+CLOG(ERROR, HTTP) << "Cannot read the content of a file to be stored in WebDAV";
 output.SendStatus(HttpStatus_400_BadRequest);
 }
 #else
 AnswerWebDavReadOnly(output, uri);
 #endif
 HttpMethod filterMethod;
 if (ExtractMethod(method, request, headers, argumentsGET))
 {
-LOG(INFO) << EnumerationToString(method) << " " << Toolbox::FlattenUri(uri);
+CLOG(INFO, HTTP) << EnumerationToString(method) << " " << Toolbox::FlattenUri(uri);
 filterMethod = method;
 }
 #if ORTHANC_ENABLE_PUGIXML == 1
 else if (!strcmp(request->request_method, "OPTIONS") ||
 !strcmp(request->request_method, "PROPFIND") ||
 !strcmp(request->request_method, "HEAD"))
 {
-LOG(INFO) << "Incoming read-only WebDAV request: "
+CLOG(INFO, HTTP) << "Incoming read-only WebDAV request: "
 << request->request_method << " " << requestUri;
 filterMethod = HttpMethod_Get;
 isWebDav = true;
 }
 else if (!strcmp(request->request_method, "PROPPATCH") ||
 !strcmp(request->request_method, "LOCK") ||
 !strcmp(request->request_method, "UNLOCK") ||
 !strcmp(request->request_method, "MKCOL"))
 {
-LOG(INFO) << "Incoming read-write WebDAV request: "
+CLOG(INFO, HTTP) << "Incoming read-write WebDAV request: "
 << request->request_method << " " << requestUri;
 filterMethod = HttpMethod_Put;
 isWebDav = true;
 }
 #endif /* ORTHANC_ENABLE_PUGIXML == 1 */
 else
 {
-LOG(INFO) << "Unknown HTTP method: " << request->request_method;
+CLOG(INFO, HTTP) << "Unknown HTTP method: " << request->request_method;
 output.SendStatus(HttpStatus_400_BadRequest);
 return;
 }
 {
 return;
 }
 else if (isWebDav)
 {
-LOG(INFO) << "No WebDAV bucket is registered against URI: "
+CLOG(INFO, HTTP) << "No WebDAV bucket is registered against URI: "
 << request->request_method << " " << requestUri;
 output.SendStatus(HttpStatus_404_NotFound);
 return;
 }
 #endif
 // Using this candidate handler results in an exception
 try
 {
 if (server->GetExceptionFormatter() == NULL)
 {
-LOG(ERROR) << "Exception in the HTTP handler: " << e.What();
+CLOG(ERROR, HTTP) << "Exception in the HTTP handler: " << e.What();
 output.SendStatus(e.GetHttpStatus());
 }
 else
 {
 server->GetExceptionFormatter()->Format(output, e, method, requestUri);
 }
 }
 catch (...)
 {
 // We should never arrive at this point, where it is even impossible to send an answer
-LOG(ERROR) << "Catastrophic error inside the HTTP server, giving up";
+CLOG(ERROR, HTTP) << "Catastrophic error inside the HTTP server, giving up";
 }
 }
 #if MONGOOSE_USE_CALLBACKS == 0
 threadsCount_(50),  // Default value in mongoose
 tcpNoDelay_(true),
 requestTimeout_(30)  // Default value in mongoose/civetweb (30 seconds)
 {
 #if ORTHANC_ENABLE_MONGOOSE == 1
-LOG(INFO) << "This Orthanc server uses Mongoose as its embedded HTTP server";
+CLOG(INFO, HTTP) << "This Orthanc server uses Mongoose as its embedded HTTP server";
 #endif
 #if ORTHANC_ENABLE_CIVETWEB == 1
-LOG(INFO) << "This Orthanc server uses CivetWeb as its embedded HTTP server";
+CLOG(INFO, HTTP) << "This Orthanc server uses CivetWeb as its embedded HTTP server";
 #endif
 #if ORTHANC_ENABLE_SSL == 1
 // Check for the Heartbleed exploit
 // https://en.wikipedia.org/wiki/OpenSSL#Heartbleed_bug
 if (OPENSSL_VERSION_NUMBER <  0x1000107fL  /* openssl-1.0.1g */ &&
 OPENSSL_VERSION_NUMBER >= 0x1000100fL  /* openssl-1.0.1 */)
 {
-LOG(WARNING) << "This version of OpenSSL is vulnerable to the Heartbleed exploit";
+CLOG(WARNING, HTTP) << "This version of OpenSSL is vulnerable to the Heartbleed exploit";
 }
 #endif
 }
 }
 void HttpServer::Start()
 {
 #if ORTHANC_ENABLE_MONGOOSE == 1
-LOG(INFO) << "Starting embedded Web server using Mongoose";
+CLOG(INFO, HTTP) << "Starting embedded Web server using Mongoose";
 #elif ORTHANC_ENABLE_CIVETWEB == 1
-LOG(INFO) << "Starting embedded Web server using Civetweb";
+CLOG(INFO, HTTP) << "Starting embedded Web server using Civetweb";
 #else
 #  error
 #endif
 if (!IsRunning())
 else
 {
 isSslError = true;
 char message[1024];
 ERR_error_string_n(code, message, sizeof(message) - 1);
-LOG(ERROR) << "OpenSSL error: " << message;
+CLOG(ERROR, HTTP) << "OpenSSL error: " << message;
 }
 }
 #endif
 if (isSslError)
 assert(it->second != NULL);
 it->second->Start();
 }
 #endif
-LOG(WARNING) << "HTTP server listening on port: " << GetPortNumber()
+CLOG(WARNING, HTTP) << "HTTP server listening on port: " << GetPortNumber()
 << " (HTTPS encryption is "
 << (IsSslEnabled() ? "enabled" : "disabled")
 << ", remote access is "
 << (IsRemoteAccessAllowed() ? "" : "not ")
 << "allowed)";
 }
 }
 void HttpServer::Stop()
 {
 void HttpServer::SetKeepAliveEnabled(bool enabled)
 {
 Stop();
 keepAlive_ = enabled;
-LOG(INFO) << "HTTP keep alive is " << (enabled ? "enabled" : "disabled");
+CLOG(INFO, HTTP) << "HTTP keep alive is " << (enabled ? "enabled" : "disabled");
 #if ORTHANC_ENABLE_MONGOOSE == 1
 if (enabled)
 {
-LOG(WARNING) << "You should disable HTTP keep alive, as you are using Mongoose";
+CLOG(WARNING, HTTP) << "You should disable HTTP keep alive, as you are using Mongoose";
 }
 #endif
 }
 void HttpServer::SetHttpCompressionEnabled(bool enabled)
 {
 Stop();
 httpCompression_ = enabled;
-LOG(WARNING) << "HTTP compression is " << (enabled ? "enabled" : "disabled");
+CLOG(WARNING, HTTP) << "HTTP compression is " << (enabled ? "enabled" : "disabled");
 }
 void HttpServer::SetIncomingHttpRequestFilter(IIncomingHttpRequestFilter& filter)
 {
 Stop();
 }
 Stop();
 threadsCount_ = threads;
-LOG(INFO) << "The embedded HTTP server will use " << threads << " threads";
+CLOG(INFO, HTTP) << "The embedded HTTP server will use " << threads << " threads";
 }
 void HttpServer::SetTcpNoDelay(bool tcpNoDelay)
 {
 Stop();
 tcpNoDelay_ = tcpNoDelay;
-LOG(INFO) << "TCP_NODELAY for the HTTP sockets is set to "
+CLOG(INFO, HTTP) << "TCP_NODELAY for the HTTP sockets is set to "
 << (tcpNoDelay ? "true" : "false");
 }
 void HttpServer::SetRequestTimeout(unsigned int seconds)
 {
 "Request timeout must be a stricly positive integer");
 }
 Stop();
 requestTimeout_ = seconds;
-LOG(INFO) << "Request timeout in the HTTP server is set to " << seconds << " seconds";
+CLOG(INFO, HTTP) << "Request timeout in the HTTP server is set to " << seconds << " seconds";
 }
 #if ORTHANC_ENABLE_PUGIXML == 1
 void HttpServer::Register(const std::vector<std::string>& root,
 Stop();
 #if CIVETWEB_HAS_WEBDAV_WRITING == 0
 if (webDavBuckets_.size() == 0)
 {
-LOG(WARNING) << "Your version of the Orthanc framework was compiled "
+CLOG(WARNING, HTTP) << "Your version of the Orthanc framework was compiled "
 << "without support for writing into WebDAV collections";
 }
 #endif
 const std::string s = Toolbox::FlattenUri(root);
 throw OrthancException(ErrorCode_ParameterOutOfRange,
 "Cannot register two WebDAV buckets at the same root: " + s);
 }
 else
 {
-LOG(INFO) << "Branching WebDAV bucket at: " << s;
+CLOG(INFO, HTTP) << "Branching WebDAV bucket at: " << s;
 webDavBuckets_[s] = protection.release();
 }
 }
 #endif
 }

Mercurial > hg > orthanc

comparison OrthancFramework/Sources/HttpServer/HttpServer.cpp @ 4295:90f91b78d708