orthanc: Core/Logging.cpp comparison

comparison Core/Logging.cpp @ 2134:ddc75c6c712d

Avoid hard crash if not enough memory

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 09 Nov 2016 12:04:09 +0100
parents	bcc575732aef
children	aa4b8895cd23

comparison

equal deleted inserted replaced

-:15ae532af70e
+:ddc75c6c712d
 {
 fprintf(stderr, "ERROR: Trying to log a message after the finalization of the logging engine\n");
 return;
 }
-LogLevel l = StringToLogLevel(level);
+try
+{
-if ((l == LogLevel_Info  && !loggingContext_->infoEnabled_) ||
+LogLevel l = StringToLogLevel(level);
-(l == LogLevel_Trace && !loggingContext_->traceEnabled_))
-{
+if ((l == LogLevel_Info  && !loggingContext_->infoEnabled_) ||
-// This logging level is disabled, directly exit and unlock
+(l == LogLevel_Trace && !loggingContext_->traceEnabled_))
-// the mutex to speed-up things. The stream is set to "/dev/null"
+{
+// This logging level is disabled, directly exit and unlock
+// the mutex to speed-up things. The stream is set to "/dev/null"
+lock_.unlock();
+return;
+}
+// Compute the header of the line, temporary release the lock as
+// this is a time-consuming operation
 lock_.unlock();
-return;
+std::string header;
-}
+{
-// Compute the header of the line, temporary release the lock as
+boost::filesystem::path path(file);
-// this is a time-consuming operation
+boost::posix_time::ptime now = boost::posix_time::microsec_clock::local_time();
-lock_.unlock();
+boost::posix_time::time_duration duration = now.time_of_day();
-std::string header;
+/**
-{
+From Google Log documentation:
-boost::filesystem::path path(file);
-boost::posix_time::ptime now = boost::posix_time::microsec_clock::local_time();
+"Log lines have this form:
-boost::posix_time::time_duration duration = now.time_of_day();
+Lmmdd hh:mm:ss.uuuuuu threadid file:line] msg...
-/**
-From Google Log documentation:
+where the fields are defined as follows:
-"Log lines have this form:
+L                A single character, representing the log level (eg 'I' for INFO)
+mm               The month (zero padded; ie May is '05')
-Lmmdd hh:mm:ss.uuuuuu threadid file:line] msg...
+dd               The day (zero padded)
+hh:mm:ss.uuuuuu  Time in hours, minutes and fractional seconds
-where the fields are defined as follows:
+threadid         The space-padded thread ID as returned by GetTID() (this matches the PID on Linux)
+file             The file name
-L                A single character, representing the log level (eg 'I' for INFO)
+line             The line number
-mm               The month (zero padded; ie May is '05')
+msg              The user-supplied message"
-dd               The day (zero padded)
-hh:mm:ss.uuuuuu  Time in hours, minutes and fractional seconds
+In this implementation, "threadid" is not printed.
-threadid         The space-padded thread ID as returned by GetTID() (this matches the PID on Linux)
+**/
-file             The file name
-line             The line number
+char date[32];
-msg              The user-supplied message"
+sprintf(date, "%c%02d%02d %02d:%02d:%02d.%06d ",
+level[0],
-In this implementation, "threadid" is not printed.
+now.date().month().as_number(),
-**/
+now.date().day().as_number(),
+duration.hours(),
-char date[32];
+duration.minutes(),
-sprintf(date, "%c%02d%02d %02d:%02d:%02d.%06d ",
+duration.seconds(),
-level[0],
+static_cast<int>(duration.fractional_seconds()));
-now.date().month().as_number(),
-now.date().day().as_number(),
+header = std::string(date) + path.filename().string() + ":" + boost::lexical_cast<std::string>(line) + "] ";
-duration.hours(),
+}
-duration.minutes(),
-duration.seconds(),
-static_cast<int>(duration.fractional_seconds()));
+// The header is computed, we now re-lock the mutex to access
+// the stream objects. Pay attention that "loggingContext_",
-header = std::string(date) + path.filename().string() + ":" + boost::lexical_cast<std::string>(line) + "] ";
+// "infoEnabled_" or "traceEnabled_" might have changed while
-}
+// the mutex was unlocked.
+lock_.lock();
-// The header is computed, we now re-lock the mutex to access
+if (loggingContext_.get() == NULL)
-// the stream objects. Pay attention that "loggingContext_",
+{
-// "infoEnabled_" or "traceEnabled_" might have changed while
+fprintf(stderr, "ERROR: Trying to log a message after the finalization of the logging engine\n");
-// the mutex was unlocked.
+return;
-lock_.lock();
+}
-if (loggingContext_.get() == NULL)
+switch (l)
 {
-fprintf(stderr, "ERROR: Trying to log a message after the finalization of the logging engine\n");
+case LogLevel_Error:
-return;
+stream_ = loggingContext_->error_;
-}
+break;
-switch (l)
+case LogLevel_Warning:
-{
+stream_ = loggingContext_->warning_;
-case LogLevel_Error:
+break;
-stream_ = loggingContext_->error_;
-break;
+case LogLevel_Info:
+if (loggingContext_->infoEnabled_)
-case LogLevel_Warning:
+{
-stream_ = loggingContext_->warning_;
+stream_ = loggingContext_->info_;
-break;
+}
-case LogLevel_Info:
+break;
-if (loggingContext_->infoEnabled_)
-{
+case LogLevel_Trace:
-stream_ = loggingContext_->info_;
+if (loggingContext_->traceEnabled_)
-}
+{
+stream_ = loggingContext_->info_;
-break;
+}
-case LogLevel_Trace:
+break;
-if (loggingContext_->traceEnabled_)
-{
+default:
-stream_ = loggingContext_->info_;
+throw OrthancException(ErrorCode_InternalError);
 }
-break;
+if (stream_ == &null_)
+{
-default:
+// The logging is disabled for this level. The stream is the
-throw OrthancException(ErrorCode_InternalError);
+// "null_" member of this object, so we can release the global
-}
+// mutex.
+lock_.unlock();
-if (stream_ == &null_)
+}
-{
-// The logging is disabled for this level. The stream is the
+(*stream_) << header;
-// "null_" member of this object, so we can release the global
+}
-// mutex.
+catch (...)
-lock_.unlock();
+{
-}
+// Something is going really wrong, probably running out of
+// memory. Fallback to a degraded mode.
-(*stream_) << header;
+stream_ = loggingContext_->error_;
+(*stream_) << "E???? ??:??:??.?????? ] ";
+}
 }
 InternalLogger::~InternalLogger()
 {

Mercurial > hg > orthanc

comparison Core/Logging.cpp @ 2134:ddc75c6c712d