orthanc: OrthancFramework/Sources/Logging.cpp comparison

comparison OrthancFramework/Sources/Logging.cpp @ 4273:0034f855c023

tuning log categories from command-line, and binary compat with orthanc framework 1.7.2

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 03 Nov 2020 12:24:50 +0100
parents	1661544ea94d
children	d7a50b7b8466

comparison

equal deleted inserted replaced

-:1661544ea94d
+:0034f855c023
 return false;
 }
 }
-LogCategory StringToCategory(const std::string& category)
+bool LookupCategory(LogCategory& target,
+const std::string& category)
 {
 if (category == "generic")
 {
-return LogCategory_GENERIC;
+target = LogCategory_GENERIC;
+return true;
 }
 else if (category == "plugins")
 {
-return LogCategory_PLUGINS;
+target = LogCategory_PLUGINS;
+return true;
 }
 else if (category == "rest")
 {
-return LogCategory_REST;
+target = LogCategory_REST;
+return true;
 }
 else if (category == "dicom")
 {
-return LogCategory_DICOM;
+target = LogCategory_DICOM;
+return true;
 }
 else if (category == "sqlite")
 {
-return LogCategory_SQLITE;
+target = LogCategory_SQLITE;
+return true;
 }
 else
 {
-throw OrthancException(ErrorCode_ParameterOutOfRange,
+return false;
-"Unknown log category: " + category);
+}
+}
+size_t GetCategoriesCount()
+{
+return 5;
+}
+const char* GetCategoryName(size_t i)
+{
+switch (i)
+{
+case 0:
+return "generic";
+case 1:
+return "plugins";
+case 2:
+return "rest";
+case 3:
+return "dicom";
+case 4:
+return "sqlite";
+default:
+throw OrthancException(ErrorCode_ParameterOutOfRange);
 }
 }
 }
 }
 loggingStreamsContext_->info_ = loggingStreamsContext_->file_.get();
 }
 }
-InternalLogger::InternalLogger(LogLevel level,
+void InternalLogger::Setup(LogCategory category,
-LogCategory category,
+const char* file,
-const char* file,
+int line)
-int line) :
-lock_(loggingStreamsMutex_, boost::defer_lock_t()),
-level_(level),
-stream_(&nullStream_)  // By default, logging to "/dev/null" is simulated
 {
 if (pluginContext_ != NULL)
 {
 // We are logging using the Orthanc plugin SDK
-if (level == LogLevel_TRACE ||
+if (level_ == LogLevel_TRACE ||
-!IsCategoryEnabled(level, category))
+!IsCategoryEnabled(level_, category))
 {
 // No trace level in plugins, directly exit as the stream is
 // set to "/dev/null"
 return;
 }
 }
 else
 {
 // We are logging in a standalone application, not inside an Orthanc plugin
-if (!IsCategoryEnabled(level, category))
+if (!IsCategoryEnabled(level_, category))
 {
 // This logging level is disabled, directly exit as the
 // stream is set to "/dev/null"
 return;
 }
 std::string prefix;
-GetLinePrefix(prefix, level, file, line);
+GetLinePrefix(prefix, level_, file, line);
 {
 // We lock the global mutex. The mutex is locked until the
 // destructor is called: No change in the output can be done.
 lock_.lock();
 fprintf(stderr, "ERROR: Trying to log a message after the finalization of the logging engine\n");
 lock_.unlock();
 return;
 }
-switch (level)
+switch (level_)
 {
 case LogLevel_ERROR:
 stream_ = loggingStreamsContext_->error_;
 break;
 }
 }
 }
+InternalLogger::InternalLogger(LogLevel level,
+LogCategory category,
+const char* file,
+int line) :
+lock_(loggingStreamsMutex_, boost::defer_lock_t()),
+level_(level),
+stream_(&nullStream_)  // By default, logging to "/dev/null" is simulated
+{
+Setup(category, file, line);
+}
+InternalLogger::InternalLogger(LogLevel level,
+const char* file,
+int line) :
+lock_(loggingStreamsMutex_, boost::defer_lock_t()),
+level_(level),
+stream_(&nullStream_)  // By default, logging to "/dev/null" is simulated
+{
+Setup(LogCategory_GENERIC, file, line);
+}
 InternalLogger::~InternalLogger()
 {
 if (pluginStream_.get() != NULL)
 {
 // We are logging through the Orthanc SDK

Mercurial > hg > orthanc

comparison OrthancFramework/Sources/Logging.cpp @ 4273:0034f855c023