orthanc: OrthancFramework/Sources/Logging.cpp annotate

annotate OrthancFramework/Sources/Logging.cpp @ 4271:1bd14c900699

LogCategory_PLUGINS

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Tue, 03 Nov 2020 07:15:44 +0100
parents	251a8b07fa37
children	1661544ea94d

rev	line source
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	1 /**
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	2 * Orthanc - A Lightweight, RESTful DICOM Store
1900 b1291df2f780 2016 Sebastien Jodogne <s.jodogne@gmail.com> parents: 1731 diff changeset	3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	4 * Department, University Hospital of Liege, Belgium
3640 94f4a18a79cc upgrade to year 2020 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3629 diff changeset	5 * Copyright (C) 2017-2020 Osimis S.A., Belgium
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	6 *
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	7 * This program is free software: you can redistribute it and/or
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	8 * modify it under the terms of the GNU Lesser General Public License
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	9 * as published by the Free Software Foundation, either version 3 of
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	10 * the License, or (at your option) any later version.
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	11 *
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	12 * This program is distributed in the hope that it will be useful, but
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * WITHOUT ANY WARRANTY; without even the implied warranty of
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	15 * Lesser General Public License for more details.
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 *
4119 bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	17 * You should have received a copy of the GNU Lesser General Public
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	18 * License along with this program. If not, see
bf7b9edf6b81 re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL Sebastien Jodogne <s.jodogne@gmail.com> parents: 4044 diff changeset	19 * <http://www.gnu.org/licenses/>.
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 **/
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 #include "PrecompiledHeaders.h"
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 #include "Logging.h"
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	25
3998 b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	26 #include "OrthancException.h"
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	27
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	28
4269 c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	29 /*********************************************************
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	30 * Common section
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	31 *********************************************************/
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	32
3998 b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	33 namespace Orthanc
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	34 {
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	35 namespace Logging
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	36 {
4270 251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	37 static const uint32_t ALL_CATEGORIES_MASK = 0xffffffff;
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	38
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	39 static uint32_t infoCategoriesMask_ = 0;
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	40 static uint32_t traceCategoriesMask_ = 0;
4269 c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	41
3998 b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	42 const char* EnumerationToString(LogLevel level)
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	43 {
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	44 switch (level)
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	45 {
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	46 case LogLevel_ERROR:
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	47 return "ERROR";
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	48
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	49 case LogLevel_WARNING:
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	50 return "WARNING";
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	51
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	52 case LogLevel_INFO:
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	53 return "INFO";
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	54
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	55 case LogLevel_TRACE:
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	56 return "TRACE";
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	57
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	58 default:
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	59 throw OrthancException(ErrorCode_ParameterOutOfRange);
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	60 }
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	61 }
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	62
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	63
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	64 LogLevel StringToLogLevel(const char *level)
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	65 {
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	66 if (strcmp(level, "ERROR") == 0)
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	67 {
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	68 return LogLevel_ERROR;
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	69 }
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	70 else if (strcmp(level, "WARNING") == 0)
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	71 {
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	72 return LogLevel_WARNING;
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	73 }
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	74 else if (strcmp(level, "INFO") == 0)
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	75 {
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	76 return LogLevel_INFO;
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	77 }
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	78 else if (strcmp(level, "TRACE") == 0)
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	79 {
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	80 return LogLevel_TRACE;
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	81 }
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	82 else
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	83 {
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	84 throw OrthancException(ErrorCode_InternalError);
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	85 }
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	86 }
4269 c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	87
4270 251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	88
4269 c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	89 void EnableInfoLevel(bool enabled)
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	90 {
4270 251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	91 if (enabled)
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	92 {
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	93 infoCategoriesMask_ = ALL_CATEGORIES_MASK;
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	94 }
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	95 else
4269 c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	96 {
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	97 // Also disable the "TRACE" level when info-level debugging is disabled
4270 251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	98 infoCategoriesMask_ = 0;
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	99 traceCategoriesMask_ = 0;
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	100 }
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	101 }
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	102
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	103
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	104 bool IsInfoLevelEnabled()
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	105 {
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	106 return (infoCategoriesMask_ != 0);
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	107 }
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	108
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	109
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	110 void EnableTraceLevel(bool enabled)
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	111 {
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	112 if (enabled)
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	113 {
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	114 // Also enable the "INFO" level when trace-level debugging is enabled
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	115 infoCategoriesMask_ = ALL_CATEGORIES_MASK;
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	116 traceCategoriesMask_ = ALL_CATEGORIES_MASK;
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	117 }
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	118 else
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	119 {
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	120 traceCategoriesMask_ = 0;
4269 c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	121 }
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	122 }
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	123
4270 251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	124
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	125 bool IsTraceLevelEnabled()
4269 c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	126 {
4270 251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	127 return (traceCategoriesMask_ != 0);
4269 c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	128 }
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	129
4270 251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	130
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	131 void SetCategoryEnabled(LogLevel level,
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	132 LogCategory category,
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	133 bool enabled)
4269 c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	134 {
4271 1bd14c900699 LogCategory_PLUGINS Sebastien Jodogne <s.jodogne@gmail.com> parents: 4270 diff changeset	135 // Invariant: If a bit is set for "trace", it must also be set
1bd14c900699 LogCategory_PLUGINS Sebastien Jodogne <s.jodogne@gmail.com> parents: 4270 diff changeset	136 // for "verbose" (in other words, trace level implies verbose level)
1bd14c900699 LogCategory_PLUGINS Sebastien Jodogne <s.jodogne@gmail.com> parents: 4270 diff changeset	137 assert((traceCategoriesMask_ & infoCategoriesMask_) == traceCategoriesMask_);
1bd14c900699 LogCategory_PLUGINS Sebastien Jodogne <s.jodogne@gmail.com> parents: 4270 diff changeset	138
4270 251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	139 if (level == LogLevel_INFO)
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	140 {
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	141 if (enabled)
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	142 {
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	143 infoCategoriesMask_ \|= static_cast<uint32_t>(category);
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	144 }
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	145 else
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	146 {
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	147 infoCategoriesMask_ &= ~static_cast<uint32_t>(category);
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	148 traceCategoriesMask_ &= ~static_cast<uint32_t>(category);
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	149 }
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	150 }
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	151 else if (level == LogLevel_TRACE)
4269 c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	152 {
4270 251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	153 if (enabled)
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	154 {
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	155 traceCategoriesMask_ \|= static_cast<uint32_t>(category);
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	156 infoCategoriesMask_ \|= static_cast<uint32_t>(category);
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	157 }
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	158 else
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	159 {
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	160 traceCategoriesMask_ &= ~static_cast<uint32_t>(category);
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	161 }
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	162 }
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	163 else
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	164 {
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	165 throw OrthancException(ErrorCode_ParameterOutOfRange,
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	166 "Can only modify the parameters of the INFO and TRACE levels");
4269 c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	167 }
4271 1bd14c900699 LogCategory_PLUGINS Sebastien Jodogne <s.jodogne@gmail.com> parents: 4270 diff changeset	168
1bd14c900699 LogCategory_PLUGINS Sebastien Jodogne <s.jodogne@gmail.com> parents: 4270 diff changeset	169 assert((traceCategoriesMask_ & infoCategoriesMask_) == traceCategoriesMask_);
4269 c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	170 }
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	171
4270 251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	172
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	173 bool IsCategoryEnabled(LogLevel level,
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	174 LogCategory category)
4269 c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	175 {
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	176 if (level == LogLevel_ERROR \|\|
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	177 level == LogLevel_WARNING)
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	178 {
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	179 return true;
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	180 }
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	181 else if (level == LogLevel_INFO)
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	182 {
4270 251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	183 return (infoCategoriesMask_ & category) != 0;
4269 c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	184 }
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	185 else if (level == LogLevel_TRACE)
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	186 {
4270 251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	187 return (traceCategoriesMask_ & category) != 0;
4269 c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	188 }
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	189 else
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	190 {
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	191 return false;
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	192 }
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	193 }
4270 251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	194
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	195
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	196 LogCategory StringToCategory(const std::string& category)
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	197 {
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	198 if (category == "generic")
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	199 {
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	200 return LogCategory_GENERIC;
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	201 }
4271 1bd14c900699 LogCategory_PLUGINS Sebastien Jodogne <s.jodogne@gmail.com> parents: 4270 diff changeset	202 else if (category == "plugins")
1bd14c900699 LogCategory_PLUGINS Sebastien Jodogne <s.jodogne@gmail.com> parents: 4270 diff changeset	203 {
1bd14c900699 LogCategory_PLUGINS Sebastien Jodogne <s.jodogne@gmail.com> parents: 4270 diff changeset	204 return LogCategory_PLUGINS;
1bd14c900699 LogCategory_PLUGINS Sebastien Jodogne <s.jodogne@gmail.com> parents: 4270 diff changeset	205 }
4270 251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	206 else if (category == "dicom")
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	207 {
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	208 return LogCategory_DICOM;
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	209 }
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	210 else if (category == "sqlite")
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	211 {
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	212 return LogCategory_SQLITE;
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	213 }
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	214 else
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	215 {
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	216 throw OrthancException(ErrorCode_ParameterOutOfRange,
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	217 "Unknown log category: " + category);
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	218 }
251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	219 }
3998 b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	220 }
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	221 }
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	222
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	223
4269 c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	224
1551 0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	225 #if ORTHANC_ENABLE_LOGGING != 1
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	226
4269 c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	227 /*********************************************************
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	228 * Section if logging is disabled
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	229 *********************************************************/
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	230
1551 0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	231 namespace Orthanc
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	232 {
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	233 namespace Logging
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	234 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	235 void InitializePluginContext(void* pluginContext)
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	236 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	237 }
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	238
1551 0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	239 void Initialize()
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	240 {
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	241 }
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	242
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	243 void Finalize()
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	244 {
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	245 }
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	246
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	247 void Reset()
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	248 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	249 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	250
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	251 void Flush()
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	252 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	253 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	254
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	255 void SetTargetFile(const std::string& path)
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	256 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	257 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	258
1551 0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	259 void SetTargetFolder(const std::string& path)
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	260 {
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	261 }
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	262 }
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	263 }
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	264
2243 2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	265
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	266 #elif ORTHANC_ENABLE_LOGGING_STDIO == 1
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	267
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	268 /*********************************************************
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	269 * Logger compatible with <stdio.h> OR logger that sends its
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	270 * output to the emscripten html5 api (depending on the
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	271 * definition of __EMSCRIPTEN__)
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	272 *********************************************************/
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	273
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	274 #include <stdio.h>
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	275
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	276 #ifdef __EMSCRIPTEN__
3506 d2b9981017c4 better handling of HTTP security Sebastien Jodogne <s.jodogne@gmail.com> parents: 3505 diff changeset	277 # include <emscripten/html5.h>
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	278 #endif
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	279
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	280 namespace Orthanc
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	281 {
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	282 namespace Logging
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	283 {
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	284 #ifdef __EMSCRIPTEN__
4010 f0ee3f1db775 removed unused Logging::SetErrorWarnInfoTraceLoggingFunctions() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4006 diff changeset	285 static void ErrorLogFunc(const char* msg)
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	286 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	287 emscripten_console_error(msg);
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	288 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	289
4010 f0ee3f1db775 removed unused Logging::SetErrorWarnInfoTraceLoggingFunctions() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4006 diff changeset	290 static void WarningLogFunc(const char* msg)
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	291 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	292 emscripten_console_warn(msg);
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	293 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	294
4010 f0ee3f1db775 removed unused Logging::SetErrorWarnInfoTraceLoggingFunctions() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4006 diff changeset	295 static void InfoLogFunc(const char* msg)
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	296 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	297 emscripten_console_log(msg);
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	298 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	299
4010 f0ee3f1db775 removed unused Logging::SetErrorWarnInfoTraceLoggingFunctions() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4006 diff changeset	300 static void TraceLogFunc(const char* msg)
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	301 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	302 emscripten_console_log(msg);
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	303 }
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	304 #else /* __EMSCRIPTEN__ not #defined */
4010 f0ee3f1db775 removed unused Logging::SetErrorWarnInfoTraceLoggingFunctions() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4006 diff changeset	305 static void ErrorLogFunc(const char* msg)
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	306 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	307 fprintf(stderr, "E: %s\n", msg);
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	308 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	309
4010 f0ee3f1db775 removed unused Logging::SetErrorWarnInfoTraceLoggingFunctions() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4006 diff changeset	310 static void WarningLogFunc(const char*)
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	311 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	312 fprintf(stdout, "W: %s\n", msg);
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	313 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	314
4010 f0ee3f1db775 removed unused Logging::SetErrorWarnInfoTraceLoggingFunctions() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4006 diff changeset	315 static void InfoLogFunc(const char*)
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	316 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	317 fprintf(stdout, "I: %s\n", msg);
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	318 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	319
4010 f0ee3f1db775 removed unused Logging::SetErrorWarnInfoTraceLoggingFunctions() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4006 diff changeset	320 static void TraceLogFunc(const char*)
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	321 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	322 fprintf(stdout, "T: %s\n", msg);
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	323 }
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	324 #endif /* __EMSCRIPTEN__ */
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	325
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	326
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	327 InternalLogger::~InternalLogger()
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	328 {
3489 e7723a39adf8 Fixed alignment issue in Toolbox::DetectEndianness() + made the internal logger Benjamin Golinvaux <bgo@osimis.io> parents: 3477 diff changeset	329 std::string message = messageStream_.str();
e7723a39adf8 Fixed alignment issue in Toolbox::DetectEndianness() + made the internal logger Benjamin Golinvaux <bgo@osimis.io> parents: 3477 diff changeset	330
4270 251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	331 if (IsCategoryEnabled(level_, category_))
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	332 {
4269 c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	333 switch (level_)
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	334 {
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	335 case LogLevel_ERROR:
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	336 ErrorLogFunc(message.c_str());
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	337 break;
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	338
4269 c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	339 case LogLevel_WARNING:
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	340 WarningLogFunc(message.c_str());
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	341 break;
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	342
4269 c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	343 case LogLevel_INFO:
4017 c783f4f29390 log using emscripten Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	344 InfoLogFunc(message.c_str());
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	345 // TODO: stone_console_info(message_.c_str());
4269 c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	346 break;
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	347
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	348 case LogLevel_TRACE:
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	349 TraceLogFunc(message.c_str());
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	350 break;
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	351
4269 c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	352 default:
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	353 {
4269 c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	354 std::stringstream ss;
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	355 ss << "Unknown log level (" << level_ << ") for message: " << message;
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	356 std::string s = ss.str();
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	357 ErrorLogFunc(s.c_str());
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	358 }
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	359 }
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	360 }
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	361 }
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	362
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	363 void InitializePluginContext(void* pluginContext)
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	364 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	365 }
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	366
3358 849c651c1381 fix missing symbol Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	367 void Initialize()
849c651c1381 fix missing symbol Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	368 {
849c651c1381 fix missing symbol Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	369 }
849c651c1381 fix missing symbol Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	370
3995 1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	371 void Finalize()
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	372 {
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	373 }
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	374
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	375 void Reset()
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	376 {
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	377 }
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	378
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	379 void Flush()
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	380 {
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	381 }
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	382
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	383 void SetTargetFile(const std::string& path)
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	384 {
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	385 }
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	386
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	387 void SetTargetFolder(const std::string& path)
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	388 {
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	389 }
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	390 }
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	391 }
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	392
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	393
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	394 #else
3995 1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	395
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	396 /*********************************************************
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	397 * Logger compatible with the Orthanc plugin SDK, or that
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	398 * mimics behavior from Google Log.
3995 1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	399 *********************************************************/
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	400
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	401 #include <cassert>
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	402
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	403 namespace
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	404 {
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	405 /**
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	406 * This is minimal implementation of the context for an Orthanc
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	407 * plugin, limited to the logging facilities, and that is binary
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	408 * compatible with the definitions of "OrthancCPlugin.h"
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	409 **/
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	410 typedef enum
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	411 {
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	412 _OrthancPluginService_LogInfo = 1,
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	413 _OrthancPluginService_LogWarning = 2,
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	414 _OrthancPluginService_LogError = 3,
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	415 _OrthancPluginService_INTERNAL = 0x7fffffff
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	416 } _OrthancPluginService;
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	417
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	418 typedef struct _OrthancPluginContext_t
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	419 {
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	420 void* pluginsManager;
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	421 const char* orthancVersion;
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	422 void (Free) (void buffer);
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	423 int32_t (InvokeService) (struct _OrthancPluginContext_t context,
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	424 _OrthancPluginService service,
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	425 const void* params);
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	426 } OrthancPluginContext;
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	427 }
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	428
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	429
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	430 #include "Enumerations.h"
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	431 #include "SystemToolbox.h"
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	432
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	433 #include <fstream>
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	434 #include <boost/filesystem.hpp>
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	435 #include <boost/thread.hpp>
2367 2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2253 diff changeset	436 #include <boost/date_time/posix_time/posix_time.hpp>
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	437
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	438
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	439 namespace
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	440 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	441 struct LoggingStreamsContext
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	442 {
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	443 std::string targetFile_;
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	444 std::string targetFolder_;
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	445
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	446 std::ostream* error_;
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	447 std::ostream* warning_;
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	448 std::ostream* info_;
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	449
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	450 std::unique_ptr<std::ofstream> file_;
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	451
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	452 LoggingStreamsContext() :
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	453 error_(&std::cerr),
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	454 warning_(&std::cerr),
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	455 info_(&std::cerr)
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	456 {
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	457 }
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	458 };
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	459 }
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	460
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	461
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	462
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	463 static std::unique_ptr<LoggingStreamsContext> loggingStreamsContext_;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	464 static boost::mutex loggingStreamsMutex_;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	465 static Orthanc::Logging::NullStream nullStream_;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	466 static OrthancPluginContext* pluginContext_ = NULL;
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	467
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	468
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	469 namespace Orthanc
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	470 {
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	471 namespace Logging
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	472 {
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	473 static void GetLogPath(boost::filesystem::path& log,
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	474 boost::filesystem::path& link,
1731 b6f656a0bf2c "--logdir" creates a single log file instead of 3 separate files for errors/warnings/infos Sebastien Jodogne <s.jodogne@gmail.com> parents: 1551 diff changeset	475 const std::string& suffix,
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	476 const std::string& directory)
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	477 {
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	478 /**
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	479 From Google Log documentation:
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	480
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	481 Unless otherwise specified, logs will be written to the filename
1731 b6f656a0bf2c "--logdir" creates a single log file instead of 3 separate files for errors/warnings/infos Sebastien Jodogne <s.jodogne@gmail.com> parents: 1551 diff changeset	482 "<program name>.<hostname>.<user name>.log<suffix>.",
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	483 followed by the date, time, and pid (you can't prevent the date,
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	484 time, and pid from being in the filename).
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	485
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	486 In this implementation : "hostname" and "username" are not used
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	487 **/
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	488
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	489 boost::posix_time::ptime now = boost::posix_time::second_clock::local_time();
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	490 boost::filesystem::path root(directory);
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2134 diff changeset	491 boost::filesystem::path exe(SystemToolbox::GetPathToExecutable());
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	492
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	493 if (!boost::filesystem::exists(root) \|\|
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	494 !boost::filesystem::is_directory(root))
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	495 {
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	496 throw OrthancException(ErrorCode_CannotWriteFile);
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	497 }
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	498
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	499 char date[64];
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	500 sprintf(date, "%04d%02d%02d-%02d%02d%02d.%d",
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	501 static_cast<int>(now.date().year()),
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	502 now.date().month().as_number(),
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	503 now.date().day().as_number(),
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	504 static_cast<int>(now.time_of_day().hours()),
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	505 static_cast<int>(now.time_of_day().minutes()),
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	506 static_cast<int>(now.time_of_day().seconds()),
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2134 diff changeset	507 SystemToolbox::GetProcessId());
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	508
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	509 std::string programName = exe.filename().replace_extension("").string();
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	510
1731 b6f656a0bf2c "--logdir" creates a single log file instead of 3 separate files for errors/warnings/infos Sebastien Jodogne <s.jodogne@gmail.com> parents: 1551 diff changeset	511 log = (root / (programName + ".log" + suffix + "." + std::string(date)));
b6f656a0bf2c "--logdir" creates a single log file instead of 3 separate files for errors/warnings/infos Sebastien Jodogne <s.jodogne@gmail.com> parents: 1551 diff changeset	512 link = (root / (programName + ".log" + suffix));
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	513 }
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	514
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	515
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	516 static void PrepareLogFolder(std::unique_ptr<std::ofstream>& file,
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	517 const std::string& suffix,
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	518 const std::string& directory)
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	519 {
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	520 boost::filesystem::path log, link;
1731 b6f656a0bf2c "--logdir" creates a single log file instead of 3 separate files for errors/warnings/infos Sebastien Jodogne <s.jodogne@gmail.com> parents: 1551 diff changeset	521 GetLogPath(log, link, suffix, directory);
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	522
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	523 #if !defined(_WIN32) && (defined(__unix__) \|\| defined(__unix) \|\| (defined(__APPLE__) && defined(__MACH__)))
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	524 boost::filesystem::remove(link);
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	525 boost::filesystem::create_symlink(log.filename(), link);
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	526 #endif
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	527
1494 a13581480b1f fix mingw build Sebastien Jodogne <s.jodogne@gmail.com> parents: 1490 diff changeset	528 file.reset(new std::ofstream(log.string().c_str()));
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	529 }
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	530
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	531
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	532 // "loggingStreamsMutex_" must be locked
4006 55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	533 static void CheckFile(std::unique_ptr<std::ofstream>& f)
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	534 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	535 if (loggingStreamsContext_->file_.get() == NULL \|\|
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	536 !loggingStreamsContext_->file_->is_open())
4006 55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	537 {
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	538 throw OrthancException(ErrorCode_CannotWriteFile);
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	539 }
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	540 }
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	541
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	542
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	543 static void GetLinePrefix(std::string& prefix,
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	544 LogLevel level,
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	545 const char* file,
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	546 int line)
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	547 {
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	548 boost::filesystem::path path(file);
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	549 boost::posix_time::ptime now = boost::posix_time::microsec_clock::local_time();
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	550 boost::posix_time::time_duration duration = now.time_of_day();
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	551
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	552 /**
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	553 From Google Log documentation:
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	554
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	555 "Log lines have this form:
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	556
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	557 Lmmdd hh:mm:ss.uuuuuu threadid file:line] msg...
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	558
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	559 where the fields are defined as follows:
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	560
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	561 L A single character, representing the log level (eg 'I' for INFO)
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	562 mm The month (zero padded; ie May is '05')
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	563 dd The day (zero padded)
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	564 hh:mm:ss.uuuuuu Time in hours, minutes and fractional seconds
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	565 threadid The space-padded thread ID as returned by GetTID() (this matches the PID on Linux)
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	566 file The file name
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	567 line The line number
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	568 msg The user-supplied message"
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	569
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	570 In this implementation, "threadid" is not printed.
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	571 **/
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	572
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	573 char c;
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	574 switch (level)
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	575 {
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	576 case LogLevel_ERROR:
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	577 c = 'E';
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	578 break;
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	579
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	580 case LogLevel_WARNING:
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	581 c = 'W';
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	582 break;
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	583
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	584 case LogLevel_INFO:
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	585 c = 'I';
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	586 break;
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	587
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	588 case LogLevel_TRACE:
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	589 c = 'T';
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	590 break;
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	591
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	592 default:
4269 c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	593 c = '?';
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	594 break;
4006 55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	595 }
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	596
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	597 char date[64];
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	598 sprintf(date, "%c%02d%02d %02d:%02d:%02d.%06d ",
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	599 c,
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	600 now.date().month().as_number(),
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	601 now.date().day().as_number(),
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	602 static_cast<int>(duration.hours()),
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	603 static_cast<int>(duration.minutes()),
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	604 static_cast<int>(duration.seconds()),
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	605 static_cast<int>(duration.fractional_seconds()));
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	606
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	607 prefix = (std::string(date) + path.filename().string() + ":" +
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	608 boost::lexical_cast<std::string>(line) + "] ");
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	609 }
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	610
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	611
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	612 void InitializePluginContext(void* pluginContext)
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	613 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	614 assert(sizeof(_OrthancPluginService) == sizeof(int32_t));
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	615
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	616 boost::mutex::scoped_lock lock(loggingStreamsMutex_);
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	617 loggingStreamsContext_.reset(NULL);
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	618 pluginContext_ = reinterpret_cast<OrthancPluginContext*>(pluginContext);
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	619 }
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	620
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	621
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	622 void Initialize()
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	623 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	624 boost::mutex::scoped_lock lock(loggingStreamsMutex_);
4026 05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4017 diff changeset	625
05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4017 diff changeset	626 if (loggingStreamsContext_.get() == NULL)
05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4017 diff changeset	627 {
05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4017 diff changeset	628 loggingStreamsContext_.reset(new LoggingStreamsContext);
05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4017 diff changeset	629 }
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	630 }
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	631
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	632 void Finalize()
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	633 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	634 boost::mutex::scoped_lock lock(loggingStreamsMutex_);
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	635 loggingStreamsContext_.reset(NULL);
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	636 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	637
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	638 void Reset()
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	639 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	640 // Recover the old logging context
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	641 std::unique_ptr<LoggingStreamsContext> old;
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	642
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	643 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	644 boost::mutex::scoped_lock lock(loggingStreamsMutex_);
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	645 if (loggingStreamsContext_.get() == NULL)
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	646 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	647 return;
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	648 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	649 else
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	650 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	651 #if __cplusplus < 201103L
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	652 old.reset(loggingStreamsContext_.release());
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	653 #else
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	654 old = std::move(loggingStreamsContext_);
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	655 #endif
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	656
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	657 // Create a new logging context,
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	658 loggingStreamsContext_.reset(new LoggingStreamsContext);
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	659 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	660 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	661
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	662 if (!old->targetFolder_.empty())
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	663 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	664 SetTargetFolder(old->targetFolder_);
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	665 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	666 else if (!old->targetFile_.empty())
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	667 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	668 SetTargetFile(old->targetFile_);
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	669 }
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	670 }
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	671
3353 54cdad5a7228 Added a public function that will use emscripten-specific logging functions when using its SDK + scaffolding work. Build and UT OK on msvc15 x64. Not actually tested under nix or emscripten yet Benjamin Golinvaux <bgo@osimis.io>* parents: 3060 diff changeset	672
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	673 void SetTargetFolder(const std::string& path)
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	674 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	675 boost::mutex::scoped_lock lock(loggingStreamsMutex_);
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	676 if (loggingStreamsContext_.get() != NULL)
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	677 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	678 PrepareLogFolder(loggingStreamsContext_->file_, "" /* no suffix */, path);
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	679 CheckFile(loggingStreamsContext_->file_);
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	680
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	681 loggingStreamsContext_->targetFile_.clear();
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	682 loggingStreamsContext_->targetFolder_ = path;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	683 loggingStreamsContext_->warning_ = loggingStreamsContext_->file_.get();
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	684 loggingStreamsContext_->error_ = loggingStreamsContext_->file_.get();
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	685 loggingStreamsContext_->info_ = loggingStreamsContext_->file_.get();
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	686 }
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	687 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	688
1731 b6f656a0bf2c "--logdir" creates a single log file instead of 3 separate files for errors/warnings/infos Sebastien Jodogne <s.jodogne@gmail.com> parents: 1551 diff changeset	689
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	690 void SetTargetFile(const std::string& path)
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	691 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	692 boost::mutex::scoped_lock lock(loggingStreamsMutex_);
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	693
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	694 if (loggingStreamsContext_.get() != NULL)
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	695 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	696 loggingStreamsContext_->file_.reset(new std::ofstream(path.c_str(), std::fstream::app));
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	697 CheckFile(loggingStreamsContext_->file_);
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	698
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	699 loggingStreamsContext_->targetFile_ = path;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	700 loggingStreamsContext_->targetFolder_.clear();
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	701 loggingStreamsContext_->warning_ = loggingStreamsContext_->file_.get();
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	702 loggingStreamsContext_->error_ = loggingStreamsContext_->file_.get();
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	703 loggingStreamsContext_->info_ = loggingStreamsContext_->file_.get();
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	704 }
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	705 }
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	706
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	707
3998 b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	708 InternalLogger::InternalLogger(LogLevel level,
4269 c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	709 LogCategory category,
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	710 const char* file,
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	711 int line) :
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	712 lock_(loggingStreamsMutex_, boost::defer_lock_t()),
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	713 level_(level),
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	714 stream_(&nullStream_) // By default, logging to "/dev/null" is simulated
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	715 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	716 if (pluginContext_ != NULL)
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	717 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	718 // We are logging using the Orthanc plugin SDK
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	719
4269 c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	720 if (level == LogLevel_TRACE \|\|
4270 251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	721 !IsCategoryEnabled(level, category))
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	722 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	723 // No trace level in plugins, directly exit as the stream is
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	724 // set to "/dev/null"
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	725 return;
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	726 }
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	727 else
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	728 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	729 pluginStream_.reset(new std::stringstream);
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	730 stream_ = pluginStream_.get();
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	731 }
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	732 }
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	733 else
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	734 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	735 // We are logging in a standalone application, not inside an Orthanc plugin
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	736
4270 251a8b07fa37 logging categories Sebastien Jodogne <s.jodogne@gmail.com> parents: 4269 diff changeset	737 if (!IsCategoryEnabled(level, category))
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	738 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	739 // This logging level is disabled, directly exit as the
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	740 // stream is set to "/dev/null"
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	741 return;
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	742 }
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	743
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	744 std::string prefix;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	745 GetLinePrefix(prefix, level, file, line);
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	746
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	747 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	748 // We lock the global mutex. The mutex is locked until the
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	749 // destructor is called: No change in the output can be done.
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	750 lock_.lock();
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	751
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	752 if (loggingStreamsContext_.get() == NULL)
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	753 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	754 fprintf(stderr, "ERROR: Trying to log a message after the finalization of the logging engine\n");
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	755 lock_.unlock();
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	756 return;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	757 }
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	758
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	759 switch (level)
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	760 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	761 case LogLevel_ERROR:
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	762 stream_ = loggingStreamsContext_->error_;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	763 break;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	764
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	765 case LogLevel_WARNING:
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	766 stream_ = loggingStreamsContext_->warning_;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	767 break;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	768
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	769 case LogLevel_INFO:
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	770 case LogLevel_TRACE:
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	771 stream_ = loggingStreamsContext_->info_;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	772 break;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	773
4269 c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	774 default: // Should not occur
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	775 stream_ = loggingStreamsContext_->error_;
c7bd2f21ccc3 new macro CLOG, and sharing more code between logging engines Sebastien Jodogne <s.jodogne@gmail.com> parents: 4268 diff changeset	776 break;
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	777 }
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	778
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	779 if (stream_ == &nullStream_)
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	780 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	781 // The logging is disabled for this level, we can release
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	782 // the global mutex.
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	783 lock_.unlock();
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	784 }
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	785 else
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	786 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	787 try
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	788 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	789 (*stream_) << prefix;
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	790 }
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	791 catch (...)
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	792 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	793 // Something is going really wrong, probably running out of
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	794 // memory. Fallback to a degraded mode.
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	795 stream_ = loggingStreamsContext_->error_;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	796 (*stream_) << "E???? ??:??:??.?????? ] ";
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	797 }
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	798 }
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	799 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	800 }
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	801 }
1507 46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	802
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	803
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	804 InternalLogger::~InternalLogger()
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	805 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	806 if (pluginStream_.get() != NULL)
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	807 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	808 // We are logging through the Orthanc SDK
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	809
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	810 std::string message = pluginStream_->str();
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	811
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	812 if (pluginContext_ != NULL)
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	813 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	814 switch (level_)
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	815 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	816 case LogLevel_ERROR:
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	817 pluginContext_->InvokeService(pluginContext_, _OrthancPluginService_LogError, message.c_str());
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	818 break;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	819
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	820 case LogLevel_WARNING:
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	821 pluginContext_->InvokeService(pluginContext_, _OrthancPluginService_LogWarning, message.c_str());
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	822 break;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	823
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	824 case LogLevel_INFO:
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	825 pluginContext_->InvokeService(pluginContext_, _OrthancPluginService_LogInfo, message.c_str());
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	826 break;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	827
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	828 default:
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	829 break;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	830 }
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	831 }
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	832 }
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	833 else if (stream_ != &nullStream_)
1507 46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	834 {
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	835 *stream_ << "\n";
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	836 stream_->flush();
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	837 }
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	838 }
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	839
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	840
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	841 void Flush()
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	842 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	843 if (pluginContext_ != NULL)
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	844 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	845 boost::mutex::scoped_lock lock(loggingStreamsMutex_);
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	846
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	847 if (loggingStreamsContext_.get() != NULL &&
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	848 loggingStreamsContext_->file_.get() != NULL)
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	849 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	850 loggingStreamsContext_->file_->flush();
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	851 }
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	852 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	853 }
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	854
3353 54cdad5a7228 Added a public function that will use emscripten-specific logging functions when using its SDK + scaffolding work. Build and UT OK on msvc15 x64. Not actually tested under nix or emscripten yet Benjamin Golinvaux <bgo@osimis.io>* parents: 3060 diff changeset	855
4004 9b5ace33a00d cleaning SetErrorWarnInfoLoggingStreams() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4003 diff changeset	856 void SetErrorWarnInfoLoggingStreams(std::ostream& errorStream,
9b5ace33a00d cleaning SetErrorWarnInfoLoggingStreams() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4003 diff changeset	857 std::ostream& warningStream,
9b5ace33a00d cleaning SetErrorWarnInfoLoggingStreams() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4003 diff changeset	858 std::ostream& infoStream)
3353 54cdad5a7228 Added a public function that will use emscripten-specific logging functions when using its SDK + scaffolding work. Build and UT OK on msvc15 x64. Not actually tested under nix or emscripten yet Benjamin Golinvaux <bgo@osimis.io>* parents: 3060 diff changeset	859 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	860 boost::mutex::scoped_lock lock(loggingStreamsMutex_);
4004 9b5ace33a00d cleaning SetErrorWarnInfoLoggingStreams() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4003 diff changeset	861
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	862 loggingStreamsContext_.reset(new LoggingStreamsContext);
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	863 loggingStreamsContext_->error_ = &errorStream;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	864 loggingStreamsContext_->warning_ = &warningStream;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	865 loggingStreamsContext_->info_ = &infoStream;
3353 54cdad5a7228 Added a public function that will use emscripten-specific logging functions when using its SDK + scaffolding work. Build and UT OK on msvc15 x64. Not actually tested under nix or emscripten yet Benjamin Golinvaux <bgo@osimis.io>* parents: 3060 diff changeset	866 }
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	867 }
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	868 }
1488 c8763b603b0e flag for plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1487 diff changeset	869
3353 54cdad5a7228 Added a public function that will use emscripten-specific logging functions when using its SDK + scaffolding work. Build and UT OK on msvc15 x64. Not actually tested under nix or emscripten yet Benjamin Golinvaux <bgo@osimis.io>* parents: 3060 diff changeset	870
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	871 #endif // ORTHANC_ENABLE_LOGGING

Mercurial > hg > orthanc

annotate OrthancFramework/Sources/Logging.cpp @ 4271:1bd14c900699