orthanc: OrthancFramework/Sources/Logging.cpp annotate

annotate OrthancFramework/Sources/Logging.cpp @ 4268:0ae2ca210077

new macro TLOG() to replace VLOG() for trace logs with a category

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Mon, 02 Nov 2020 14:48:15 +0100
parents	bf7b9edf6b81
children	c7bd2f21ccc3

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
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	29 namespace Orthanc
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	30 {
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	31 namespace Logging
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	32 {
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	33 const char* EnumerationToString(LogLevel level)
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 switch (level)
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	36 {
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	37 case LogLevel_ERROR:
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	38 return "ERROR";
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	39
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	40 case LogLevel_WARNING:
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	41 return "WARNING";
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	42
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	43 case LogLevel_INFO:
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	44 return "INFO";
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_TRACE:
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	47 return "TRACE";
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 default:
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	50 throw OrthancException(ErrorCode_ParameterOutOfRange);
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 }
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	53
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 LogLevel StringToLogLevel(const char *level)
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	56 {
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	57 if (strcmp(level, "ERROR") == 0)
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	58 {
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	59 return LogLevel_ERROR;
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 else if (strcmp(level, "WARNING") == 0)
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 return LogLevel_WARNING;
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	64 }
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	65 else if (strcmp(level, "INFO") == 0)
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	66 {
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	67 return LogLevel_INFO;
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	68 }
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	69 else if (strcmp(level, "TRACE") == 0)
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	70 {
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	71 return LogLevel_TRACE;
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	72 }
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	73 else
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	74 {
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	75 throw OrthancException(ErrorCode_InternalError);
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	76 }
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 }
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
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	81
1551 0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	82 #if ORTHANC_ENABLE_LOGGING != 1
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	83
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	84 namespace Orthanc
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	85 {
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	86 namespace Logging
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	87 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	88 void InitializePluginContext(void* pluginContext)
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	89 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	90 }
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	91
1551 0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	92 void Initialize()
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	93 {
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	94 }
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	95
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	96 void Finalize()
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	97 {
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	98 }
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	99
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	100 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	101 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	102 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	103
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	104 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	105 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	106 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	107
1551 0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	108 void EnableInfoLevel(bool enabled)
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	109 {
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	110 }
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	111
1551 0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	112 void EnableTraceLevel(bool enabled)
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	113 {
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	114 }
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	115
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	116 bool IsTraceLevelEnabled()
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	117 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	118 return false;
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	119 }
1551 0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	120
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	121 bool IsInfoLevelEnabled()
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	122 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	123 return false;
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	124 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	125
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	126 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	127 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	128 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	129
1551 0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	130 void SetTargetFolder(const std::string& path)
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	131 {
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	132 }
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	133 }
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	134 }
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	135
2243 2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	136
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	137 #elif ORTHANC_ENABLE_LOGGING_STDIO == 1
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	138
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	139 /*********************************************************
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	140 * 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	141 * 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	142 * definition of __EMSCRIPTEN__)
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	143 *********************************************************/
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	144
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	145 #include <stdio.h>
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	146
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	147 #ifdef __EMSCRIPTEN__
3506 d2b9981017c4 better handling of HTTP security Sebastien Jodogne <s.jodogne@gmail.com> parents: 3505 diff changeset	148 # 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	149 #endif
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	150
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	151 namespace Orthanc
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	152 {
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	153 namespace Logging
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	154 {
4017 c783f4f29390 log using emscripten Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	155 static bool infoEnabled_ = false;
c783f4f29390 log using emscripten Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	156 static bool traceEnabled_ = false;
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	157
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	158 #ifdef __EMSCRIPTEN__
4010 f0ee3f1db775 removed unused Logging::SetErrorWarnInfoTraceLoggingFunctions() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4006 diff changeset	159 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	160 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	161 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	162 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	163
4010 f0ee3f1db775 removed unused Logging::SetErrorWarnInfoTraceLoggingFunctions() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4006 diff changeset	164 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	165 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	166 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	167 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	168
4010 f0ee3f1db775 removed unused Logging::SetErrorWarnInfoTraceLoggingFunctions() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4006 diff changeset	169 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	170 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	171 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	172 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	173
4010 f0ee3f1db775 removed unused Logging::SetErrorWarnInfoTraceLoggingFunctions() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4006 diff changeset	174 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	175 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	176 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	177 }
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	178 #else /* __EMSCRIPTEN__ not #defined */
4010 f0ee3f1db775 removed unused Logging::SetErrorWarnInfoTraceLoggingFunctions() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4006 diff changeset	179 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	180 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	181 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	182 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	183
4010 f0ee3f1db775 removed unused Logging::SetErrorWarnInfoTraceLoggingFunctions() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4006 diff changeset	184 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	185 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	186 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	187 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	188
4010 f0ee3f1db775 removed unused Logging::SetErrorWarnInfoTraceLoggingFunctions() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4006 diff changeset	189 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	190 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	191 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	192 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	193
4010 f0ee3f1db775 removed unused Logging::SetErrorWarnInfoTraceLoggingFunctions() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4006 diff changeset	194 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	195 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	196 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	197 }
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	198 #endif /* __EMSCRIPTEN__ */
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	199
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	200
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	201 InternalLogger::~InternalLogger()
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	202 {
3489 e7723a39adf8 Fixed alignment issue in Toolbox::DetectEndianness() + made the internal logger Benjamin Golinvaux <bgo@osimis.io> parents: 3477 diff changeset	203 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	204
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	205 switch (level_)
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	206 {
3998 b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	207 case LogLevel_ERROR:
4017 c783f4f29390 log using emscripten Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	208 ErrorLogFunc(message.c_str());
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	209 break;
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	210
3998 b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	211 case LogLevel_WARNING:
4017 c783f4f29390 log using emscripten Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	212 WarningLogFunc(message.c_str());
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	213 break;
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	214
3998 b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	215 case LogLevel_INFO:
4017 c783f4f29390 log using emscripten Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	216 if (infoEnabled_)
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	217 {
4017 c783f4f29390 log using emscripten Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	218 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	219 // TODO: stone_console_info(message_.c_str());
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	220 }
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	221 break;
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	222
3998 b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	223 case LogLevel_TRACE:
4268 0ae2ca210077 new macro TLOG() to replace VLOG() for trace logs with a category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	224 // TODO - Check trace category
4017 c783f4f29390 log using emscripten Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	225 if (traceEnabled_)
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	226 {
4017 c783f4f29390 log using emscripten Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	227 TraceLogFunc(message.c_str());
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	228 }
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	229 break;
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	230
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	231 default:
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	232 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	233 std::stringstream ss;
3489 e7723a39adf8 Fixed alignment issue in Toolbox::DetectEndianness() + made the internal logger Benjamin Golinvaux <bgo@osimis.io> parents: 3477 diff changeset	234 ss << "Unknown log level (" << level_ << ") for message: " << message;
3505 b2d4dd16dae8 removed C++11 primitive Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	235 std::string s = ss.str();
4017 c783f4f29390 log using emscripten Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	236 ErrorLogFunc(s.c_str());
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	237 }
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	238 }
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	239 }
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	240
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	241 void InitializePluginContext(void* pluginContext)
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	242 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	243 }
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	244
3358 849c651c1381 fix missing symbol Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	245 void Initialize()
849c651c1381 fix missing symbol Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	246 {
849c651c1381 fix missing symbol Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	247 }
849c651c1381 fix missing symbol Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	248
3995 1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	249 void Finalize()
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	250 {
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	251 }
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	252
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	253 void Reset()
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	254 {
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	255 }
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	256
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	257 void Flush()
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	258 {
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	259 }
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	260
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	261 void EnableInfoLevel(bool enabled)
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	262 {
4017 c783f4f29390 log using emscripten Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	263 infoEnabled_ = enabled;
c783f4f29390 log using emscripten Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	264
c783f4f29390 log using emscripten Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	265 if (!enabled)
c783f4f29390 log using emscripten Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	266 {
c783f4f29390 log using emscripten Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	267 // Also disable the "TRACE" level when info-level debugging is disabled
c783f4f29390 log using emscripten Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	268 traceEnabled_ = false;
c783f4f29390 log using emscripten Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	269 }
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	270 }
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	271
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	272 bool IsInfoLevelEnabled()
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	273 {
4017 c783f4f29390 log using emscripten Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	274 return infoEnabled_;
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	275 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	276
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	277 void EnableTraceLevel(bool enabled)
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	278 {
4017 c783f4f29390 log using emscripten Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	279 traceEnabled_ = enabled;
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	280 }
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	281
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	282 bool IsTraceLevelEnabled()
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	283 {
4017 c783f4f29390 log using emscripten Sebastien Jodogne <s.jodogne@gmail.com> parents: 4014 diff changeset	284 return traceEnabled_;
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	285 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	286
3995 1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	287 void SetTargetFile(const std::string& path)
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	288 {
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	289 }
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	290
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	291 void SetTargetFolder(const std::string& path)
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	292 {
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	293 }
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	294 }
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	295 }
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	296
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	297
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	298 #else
3995 1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	299
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	300 /*********************************************************
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	301 * 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	302 * mimics behavior from Google Log.
3995 1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	303 *********************************************************/
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	304
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	305 #include <cassert>
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	306
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	307 namespace
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	308 {
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	309 /**
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	310 * This is minimal implementation of the context for an Orthanc
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	311 * plugin, limited to the logging facilities, and that is binary
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	312 * compatible with the definitions of "OrthancCPlugin.h"
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	313 **/
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	314 typedef enum
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	315 {
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	316 _OrthancPluginService_LogInfo = 1,
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	317 _OrthancPluginService_LogWarning = 2,
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	318 _OrthancPluginService_LogError = 3,
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	319 _OrthancPluginService_INTERNAL = 0x7fffffff
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	320 } _OrthancPluginService;
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	321
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	322 typedef struct _OrthancPluginContext_t
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	323 {
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	324 void* pluginsManager;
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	325 const char* orthancVersion;
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	326 void (Free) (void buffer);
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	327 int32_t (InvokeService) (struct _OrthancPluginContext_t context,
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	328 _OrthancPluginService service,
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	329 const void* params);
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	330 } OrthancPluginContext;
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	331 }
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	332
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	333
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	334 #include "Enumerations.h"
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	335 #include "SystemToolbox.h"
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	336
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	337 #include <fstream>
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	338 #include <boost/filesystem.hpp>
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	339 #include <boost/thread.hpp>
2367 2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2253 diff changeset	340 #include <boost/date_time/posix_time/posix_time.hpp>
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	341
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	342
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	343 namespace
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	344 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	345 struct LoggingStreamsContext
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	346 {
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	347 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	348 std::string targetFolder_;
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	349
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	350 std::ostream* error_;
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	351 std::ostream* warning_;
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	352 std::ostream* info_;
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	353
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	354 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	355
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	356 LoggingStreamsContext() :
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	357 error_(&std::cerr),
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	358 warning_(&std::cerr),
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	359 info_(&std::cerr)
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	360 {
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	361 }
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	362 };
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	363 }
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	364
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	365
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	366
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	367 static std::unique_ptr<LoggingStreamsContext> loggingStreamsContext_;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	368 static boost::mutex loggingStreamsMutex_;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	369 static Orthanc::Logging::NullStream nullStream_;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	370 static OrthancPluginContext* pluginContext_ = NULL;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	371 static bool infoEnabled_ = false;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	372 static bool traceEnabled_ = false;
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	373
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	374
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	375 namespace Orthanc
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	376 {
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	377 namespace Logging
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	378 {
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	379 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	380 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	381 const std::string& suffix,
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	382 const std::string& directory)
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	383 {
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	384 /**
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	385 From Google Log documentation:
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	386
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	387 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	388 "<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	389 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	390 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	391
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	392 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	393 **/
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	394
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	395 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	396 boost::filesystem::path root(directory);
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2134 diff changeset	397 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	398
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	399 if (!boost::filesystem::exists(root) \|\|
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	400 !boost::filesystem::is_directory(root))
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	401 {
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	402 throw OrthancException(ErrorCode_CannotWriteFile);
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	403 }
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	404
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	405 char date[64];
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	406 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	407 static_cast<int>(now.date().year()),
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	408 now.date().month().as_number(),
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	409 now.date().day().as_number(),
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	410 static_cast<int>(now.time_of_day().hours()),
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	411 static_cast<int>(now.time_of_day().minutes()),
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	412 static_cast<int>(now.time_of_day().seconds()),
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2134 diff changeset	413 SystemToolbox::GetProcessId());
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	414
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	415 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	416
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	417 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	418 link = (root / (programName + ".log" + suffix));
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	419 }
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	420
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	421
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	422 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	423 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	424 const std::string& directory)
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	425 {
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	426 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	427 GetLogPath(log, link, suffix, directory);
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	428
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	429 #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	430 boost::filesystem::remove(link);
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	431 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	432 #endif
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	433
1494 a13581480b1f fix mingw build Sebastien Jodogne <s.jodogne@gmail.com> parents: 1490 diff changeset	434 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	435 }
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	436
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	437
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	438 // "loggingStreamsMutex_" must be locked
4006 55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	439 static void CheckFile(std::unique_ptr<std::ofstream>& f)
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	440 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	441 if (loggingStreamsContext_->file_.get() == NULL \|\|
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	442 !loggingStreamsContext_->file_->is_open())
4006 55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	443 {
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	444 throw OrthancException(ErrorCode_CannotWriteFile);
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	445 }
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	446 }
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	447
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	448
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	449 static void GetLinePrefix(std::string& prefix,
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	450 LogLevel level,
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	451 const char* file,
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	452 int line)
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	453 {
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	454 boost::filesystem::path path(file);
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	455 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	456 boost::posix_time::time_duration duration = now.time_of_day();
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	457
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	458 /**
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	459 From Google Log documentation:
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	460
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	461 "Log lines have this form:
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	462
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	463 Lmmdd hh:mm:ss.uuuuuu threadid file:line] msg...
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	464
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	465 where the fields are defined as follows:
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	466
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	467 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	468 mm The month (zero padded; ie May is '05')
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	469 dd The day (zero padded)
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	470 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	471 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	472 file The file name
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	473 line The line number
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	474 msg The user-supplied message"
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	475
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	476 In this implementation, "threadid" is not printed.
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	477 **/
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	478
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	479 char c;
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	480 switch (level)
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	481 {
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	482 case LogLevel_ERROR:
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	483 c = 'E';
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	484 break;
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	485
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	486 case LogLevel_WARNING:
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	487 c = 'W';
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	488 break;
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	489
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	490 case LogLevel_INFO:
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	491 c = 'I';
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	492 break;
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	493
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	494 case LogLevel_TRACE:
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	495 c = 'T';
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	496 break;
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	497
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	498 default:
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	499 throw OrthancException(ErrorCode_InternalError);
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	500 }
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	501
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	502 char date[64];
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	503 sprintf(date, "%c%02d%02d %02d:%02d:%02d.%06d ",
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	504 c,
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	505 now.date().month().as_number(),
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	506 now.date().day().as_number(),
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	507 static_cast<int>(duration.hours()),
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	508 static_cast<int>(duration.minutes()),
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	509 static_cast<int>(duration.seconds()),
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	510 static_cast<int>(duration.fractional_seconds()));
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	511
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	512 prefix = (std::string(date) + path.filename().string() + ":" +
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	513 boost::lexical_cast<std::string>(line) + "] ");
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	514 }
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	515
55710d73780f reorganizing Logging.cpp Sebastien Jodogne <s.jodogne@gmail.com> parents: 4005 diff changeset	516
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	517 void InitializePluginContext(void* pluginContext)
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	518 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	519 assert(sizeof(_OrthancPluginService) == sizeof(int32_t));
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	520
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	521 boost::mutex::scoped_lock lock(loggingStreamsMutex_);
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	522 loggingStreamsContext_.reset(NULL);
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	523 pluginContext_ = reinterpret_cast<OrthancPluginContext*>(pluginContext);
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	524 }
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	525
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	526
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	527 void Initialize()
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	528 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	529 boost::mutex::scoped_lock lock(loggingStreamsMutex_);
4026 05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4017 diff changeset	530
05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4017 diff changeset	531 if (loggingStreamsContext_.get() == NULL)
05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4017 diff changeset	532 {
05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4017 diff changeset	533 loggingStreamsContext_.reset(new LoggingStreamsContext);
05a363186da6 ORTHANC_BUILDING_FRAMEWORK_LIBRARY, Orthanc::InitializeFramework() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4017 diff changeset	534 }
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	535 }
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	536
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	537 void Finalize()
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	538 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	539 boost::mutex::scoped_lock lock(loggingStreamsMutex_);
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	540 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	541 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	542
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	543 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	544 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	545 // Recover the old logging context
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	546 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	547
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	548 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	549 boost::mutex::scoped_lock lock(loggingStreamsMutex_);
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	550 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	551 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	552 return;
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	553 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	554 else
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	555 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	556 #if __cplusplus < 201103L
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	557 old.reset(loggingStreamsContext_.release());
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	558 #else
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	559 old = std::move(loggingStreamsContext_);
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	560 #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	561
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	562 // Create a new logging context,
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	563 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	564 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	565 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	566
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	567 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	568 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	569 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	570 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	571 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	572 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	573 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	574 }
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	575 }
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	576
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	577
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	578 void EnableInfoLevel(bool enabled)
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	579 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	580 infoEnabled_ = enabled;
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	581
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	582 if (!enabled)
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	583 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	584 // Also disable the "TRACE" level when info-level debugging is disabled
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	585 traceEnabled_ = false;
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	586 }
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	587 }
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	588
3629 19966d299685 Fixed typo in function impl name Benjamin Golinvaux <bgo@osimis.io> parents: 3506 diff changeset	589 bool IsInfoLevelEnabled()
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	590 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	591 return infoEnabled_;
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	592 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	593
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	594 void EnableTraceLevel(bool enabled)
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	595 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	596 traceEnabled_ = enabled;
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	597
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	598 if (enabled)
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	599 {
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	600 // Also enable the "INFO" level when trace-level debugging is enabled
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	601 infoEnabled_ = true;
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	602 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	603 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	604
3629 19966d299685 Fixed typo in function impl name Benjamin Golinvaux <bgo@osimis.io> parents: 3506 diff changeset	605 bool IsTraceLevelEnabled()
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	606 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	607 return traceEnabled_;
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	608 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	609
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	610
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	611 void SetTargetFolder(const std::string& path)
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	612 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	613 boost::mutex::scoped_lock lock(loggingStreamsMutex_);
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	614 if (loggingStreamsContext_.get() != NULL)
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 PrepareLogFolder(loggingStreamsContext_->file_, "" /* no suffix */, path);
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	617 CheckFile(loggingStreamsContext_->file_);
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	618
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	619 loggingStreamsContext_->targetFile_.clear();
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	620 loggingStreamsContext_->targetFolder_ = path;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	621 loggingStreamsContext_->warning_ = loggingStreamsContext_->file_.get();
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	622 loggingStreamsContext_->error_ = loggingStreamsContext_->file_.get();
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	623 loggingStreamsContext_->info_ = loggingStreamsContext_->file_.get();
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	624 }
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	625 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	626
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	627
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	628 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	629 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	630 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	631
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	632 if (loggingStreamsContext_.get() != NULL)
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	633 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	634 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	635 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	636
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	637 loggingStreamsContext_->targetFile_ = path;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	638 loggingStreamsContext_->targetFolder_.clear();
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	639 loggingStreamsContext_->warning_ = loggingStreamsContext_->file_.get();
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	640 loggingStreamsContext_->error_ = loggingStreamsContext_->file_.get();
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	641 loggingStreamsContext_->info_ = loggingStreamsContext_->file_.get();
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	642 }
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	643 }
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	644
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	645
3998 b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	646 InternalLogger::InternalLogger(LogLevel level,
4268 0ae2ca210077 new macro TLOG() to replace VLOG() for trace logs with a category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	647 TraceCategory category,
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	648 const char* file,
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	649 int line) :
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	650 lock_(loggingStreamsMutex_, boost::defer_lock_t()),
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	651 level_(level),
4268 0ae2ca210077 new macro TLOG() to replace VLOG() for trace logs with a category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	652 category_(category),
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	653 stream_(&nullStream_) // By default, logging to "/dev/null" is simulated
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	654 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	655 if (pluginContext_ != NULL)
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	656 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	657 // We are logging using the Orthanc plugin SDK
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	658
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	659 if (level == LogLevel_TRACE)
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	660 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	661 // 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	662 // set to "/dev/null"
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	663 return;
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	664 }
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	665 else
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	666 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	667 pluginStream_.reset(new std::stringstream);
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	668 stream_ = pluginStream_.get();
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	669 }
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	670 }
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	671 else
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	672 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	673 // 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	674
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	675 if ((level == LogLevel_INFO && !infoEnabled_) \|\|
4268 0ae2ca210077 new macro TLOG() to replace VLOG() for trace logs with a category Sebastien Jodogne <s.jodogne@gmail.com> parents: 4119 diff changeset	676 (level == LogLevel_TRACE && !traceEnabled_)) // TODO - Check trace category
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	677 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	678 // 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	679 // 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	680 return;
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	681 }
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	682
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	683 std::string prefix;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	684 GetLinePrefix(prefix, level, file, line);
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	685
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	686 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	687 // 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	688 // 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	689 lock_.lock();
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	690
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	691 if (loggingStreamsContext_.get() == NULL)
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	692 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	693 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	694 lock_.unlock();
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	695 return;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	696 }
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	697
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	698 switch (level)
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	699 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	700 case LogLevel_ERROR:
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	701 stream_ = loggingStreamsContext_->error_;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	702 break;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	703
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	704 case LogLevel_WARNING:
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	705 stream_ = loggingStreamsContext_->warning_;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	706 break;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	707
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	708 case LogLevel_INFO:
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	709 case LogLevel_TRACE:
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	710 stream_ = loggingStreamsContext_->info_;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	711 break;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	712
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	713 default:
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	714 throw OrthancException(ErrorCode_InternalError);
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	715 }
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	716
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	717 if (stream_ == &nullStream_)
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	718 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	719 // 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	720 // the global mutex.
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	721 lock_.unlock();
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	722 }
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	723 else
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	724 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	725 try
2134 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 (*stream_) << prefix;
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	728 }
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	729 catch (...)
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	730 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	731 // 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	732 // memory. Fallback to a degraded mode.
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	733 stream_ = loggingStreamsContext_->error_;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	734 (*stream_) << "E???? ??:??:??.?????? ] ";
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	735 }
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	736 }
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	737 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	738 }
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	739 }
1507 46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	740
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	741
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	742 InternalLogger::~InternalLogger()
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	743 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	744 if (pluginStream_.get() != NULL)
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	745 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	746 // 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	747
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	748 std::string message = pluginStream_->str();
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	749
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	750 if (pluginContext_ != NULL)
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 switch (level_)
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 case LogLevel_ERROR:
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	755 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	756 break;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	757
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	758 case LogLevel_WARNING:
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	759 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	760 break;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	761
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	762 case LogLevel_INFO:
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	763 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	764 break;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	765
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	766 default:
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 }
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	770 }
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	771 else if (stream_ != &nullStream_)
1507 46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	772 {
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	773 *stream_ << "\n";
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	774 stream_->flush();
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	775 }
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	776 }
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	777
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	778
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	779 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	780 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	781 if (pluginContext_ != NULL)
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	782 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	783 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	784
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	785 if (loggingStreamsContext_.get() != NULL &&
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	786 loggingStreamsContext_->file_.get() != NULL)
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	787 {
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	788 loggingStreamsContext_->file_->flush();
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	789 }
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	790 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	791 }
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	792
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	793
4004 9b5ace33a00d cleaning SetErrorWarnInfoLoggingStreams() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4003 diff changeset	794 void SetErrorWarnInfoLoggingStreams(std::ostream& errorStream,
9b5ace33a00d cleaning SetErrorWarnInfoLoggingStreams() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4003 diff changeset	795 std::ostream& warningStream,
9b5ace33a00d cleaning SetErrorWarnInfoLoggingStreams() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4003 diff changeset	796 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	797 {
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	798 boost::mutex::scoped_lock lock(loggingStreamsMutex_);
4004 9b5ace33a00d cleaning SetErrorWarnInfoLoggingStreams() Sebastien Jodogne <s.jodogne@gmail.com> parents: 4003 diff changeset	799
4014 27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	800 loggingStreamsContext_.reset(new LoggingStreamsContext);
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	801 loggingStreamsContext_->error_ = &errorStream;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	802 loggingStreamsContext_->warning_ = &warningStream;
27628b0f6ada merging logging code for plugins and files Sebastien Jodogne <s.jodogne@gmail.com> parents: 4010 diff changeset	803 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	804 }
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	805 }
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	806 }
1488 c8763b603b0e flag for plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1487 diff changeset	807
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	808
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	809 #endif // ORTHANC_ENABLE_LOGGING

Mercurial > hg > orthanc

annotate OrthancFramework/Sources/Logging.cpp @ 4268:0ae2ca210077