orthanc: Core/Logging.cpp annotate

annotate Core/Logging.cpp @ 4002:02e61695cd83

style

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Sat, 06 Jun 2020 10:58:36 +0200
parents	b3f09bc9734b
children	3c19371090c3

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
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	8 * modify it under the terms of the GNU General Public License as
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	9 * published by the Free Software Foundation, either version 3 of the
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	10 * License, or (at your option) any later version.
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 * In addition, as a special exception, the copyright holders of this
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	13 * program give permission to link the code of its release with the
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	14 * OpenSSL project's "OpenSSL" library (or with modified versions of it
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	15 * that use the same license as the "OpenSSL" library), and distribute
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	16 * the linked executables. You must obey the GNU General Public License
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	17 * in all respects for all of the code used other than "OpenSSL". If you
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	18 * modify file(s) with this exception, you may extend this exception to
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	19 * your version of the file(s), but you are not obligated to do so. If
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	20 * you do not wish to do so, delete this exception statement from your
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	21 * version. If you delete this exception statement from all source files
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	22 * in the program, then also delete it here.
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	23 *
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	24 * 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	25 * WITHOUT ANY WARRANTY; without even the implied warranty of
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	26 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	27 * General Public License for more details.
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	28 *
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	29 * You should have received a copy of the GNU General Public License
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	30 * along with this program. If not, see <http://www.gnu.org/licenses/>.
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	31 **/
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	32
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	33
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	34 #include "PrecompiledHeaders.h"
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	35 #include "Logging.h"
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	36
3998 b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	37 #include "OrthancException.h"
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	38
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 namespace Orthanc
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	41 {
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	42 namespace Logging
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	43 {
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	44 const char* EnumerationToString(LogLevel level)
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	45 {
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	46 switch (level)
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	47 {
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	48 case LogLevel_ERROR:
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	49 return "ERROR";
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	50
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	51 case LogLevel_WARNING:
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	52 return "WARNING";
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 case LogLevel_INFO:
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	55 return "INFO";
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 case LogLevel_TRACE:
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	58 return "TRACE";
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	59
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	60 default:
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	61 throw OrthancException(ErrorCode_ParameterOutOfRange);
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	62 }
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	63 }
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	64
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	65
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	66 LogLevel StringToLogLevel(const char *level)
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	67 {
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	68 if (strcmp(level, "ERROR") == 0)
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	69 {
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	70 return LogLevel_ERROR;
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	71 }
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	72 else if (strcmp(level, "WARNING") == 0)
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	73 {
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	74 return LogLevel_WARNING;
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	75 }
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	76 else if (strcmp(level, "INFO") == 0)
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 return LogLevel_INFO;
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 else if (strcmp(level, "TRACE") == 0)
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	81 {
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	82 return LogLevel_TRACE;
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	83 }
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	84 else
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	85 {
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	86 throw OrthancException(ErrorCode_InternalError);
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	87 }
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	88 }
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	89 }
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	90 }
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	91
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	92
1551 0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	93 #if ORTHANC_ENABLE_LOGGING != 1
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 namespace Orthanc
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	96 {
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	97 namespace Logging
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	98 {
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	99 void Initialize()
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	100 {
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	101 }
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	102
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	103 void Finalize()
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	104 {
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	105 }
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	106
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	107 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	108 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	109 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	110
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	111 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	112 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	113 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	114
1551 0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	115 void EnableInfoLevel(bool enabled)
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	116 {
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	117 }
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	118
1551 0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	119 void EnableTraceLevel(bool enabled)
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	120 {
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	121 }
3359 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 bool IsTraceLevelEnabled()
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 return false;
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	126 }
1551 0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	127
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	128 bool IsInfoLevelEnabled()
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	129 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	130 return false;
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	131 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	132
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	133 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	134 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	135 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	136
1551 0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	137 void SetTargetFolder(const std::string& path)
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	138 {
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	139 }
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	140 }
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	141 }
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	142
2243 2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	143
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	144 #elif ORTHANC_ENABLE_LOGGING_STDIO == 1
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	145
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 * 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	148 * 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	149 * definition of __EMSCRIPTEN__)
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	150 *********************************************************/
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	151
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	152 #include <stdio.h>
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	153 #include <boost/lexical_cast.hpp>
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	154
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	155 #ifdef __EMSCRIPTEN__
3506 d2b9981017c4 better handling of HTTP security Sebastien Jodogne <s.jodogne@gmail.com> parents: 3505 diff changeset	156 # 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	157 #endif
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	158
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	159 namespace Orthanc
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	160 {
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	161 namespace Logging
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	162 {
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	163 static bool globalVerbose_ = false;
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	164 static bool globalTrace_ = false;
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	165
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	166 #ifdef __EMSCRIPTEN__
3995 1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	167 static void defaultErrorLogFunc(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	168 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	169 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	170 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	171
3995 1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	172 static void defaultWarningLogFunc(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	173 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	174 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	175 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	176
3995 1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	177 static void defaultInfoLogFunc(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	178 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	179 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	180 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	181
3995 1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	182 static void defaultTraceLogFunc(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	183 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	184 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	185 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	186 #else
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	187 // __EMSCRIPTEN__ not #defined
3995 1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	188 static void defaultErrorLogFunc(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	189 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	190 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	191 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	192
3995 1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	193 static void defaultWarningLogFunc(const char*)
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	194 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	195 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	196 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	197
3995 1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	198 static void defaultInfoLogFunc(const char*)
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	199 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	200 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	201 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	202
3995 1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	203 static void defaultTraceLogFunc(const char*)
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	204 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	205 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	206 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	207 #endif
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	208 // __EMSCRIPTEN__
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	209
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	210 static LoggingFunction globalErrorLogFunc = defaultErrorLogFunc;
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	211 static LoggingFunction globalWarningLogFunc = defaultWarningLogFunc;
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	212 static LoggingFunction globalInfoLogFunc = defaultInfoLogFunc;
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	213 static LoggingFunction globalTraceLogFunc = defaultTraceLogFunc;
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	214
3995 1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	215 void SetErrorWarnInfoTraceLoggingFunctions(LoggingFunction errorLogFunc,
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	216 LoggingFunction warningLogfunc,
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	217 LoggingFunction infoLogFunc,
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	218 LoggingFunction traceLogFunc)
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	219 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	220 globalErrorLogFunc = errorLogFunc;
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	221 globalWarningLogFunc = warningLogfunc;
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	222 globalInfoLogFunc = infoLogFunc;
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	223 globalTraceLogFunc = traceLogFunc;
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	224 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	225
3998 b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	226 InternalLogger::InternalLogger(LogLevel level,
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	227 const char* file /* ignored */,
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	228 int line /* ignored */) :
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	229 level_(level)
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 }
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	232
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	233 InternalLogger::~InternalLogger()
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	234 {
3489 e7723a39adf8 Fixed alignment issue in Toolbox::DetectEndianness() + made the internal logger Benjamin Golinvaux <bgo@osimis.io> parents: 3477 diff changeset	235 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	236
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	237 switch (level_)
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	238 {
3998 b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	239 case LogLevel_ERROR:
3489 e7723a39adf8 Fixed alignment issue in Toolbox::DetectEndianness() + made the internal logger Benjamin Golinvaux <bgo@osimis.io> parents: 3477 diff changeset	240 globalErrorLogFunc(message.c_str());
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	241 break;
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	242
3998 b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	243 case LogLevel_WARNING:
3489 e7723a39adf8 Fixed alignment issue in Toolbox::DetectEndianness() + made the internal logger Benjamin Golinvaux <bgo@osimis.io> parents: 3477 diff changeset	244 globalWarningLogFunc(message.c_str());
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	245 break;
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	246
3998 b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	247 case LogLevel_INFO:
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	248 if (globalVerbose_)
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	249 {
3489 e7723a39adf8 Fixed alignment issue in Toolbox::DetectEndianness() + made the internal logger Benjamin Golinvaux <bgo@osimis.io> parents: 3477 diff changeset	250 globalInfoLogFunc(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	251 // TODO: stone_console_info(message_.c_str());
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	252 }
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	253 break;
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	254
3998 b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	255 case LogLevel_TRACE:
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	256 if (globalTrace_)
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	257 {
3489 e7723a39adf8 Fixed alignment issue in Toolbox::DetectEndianness() + made the internal logger Benjamin Golinvaux <bgo@osimis.io> parents: 3477 diff changeset	258 globalTraceLogFunc(message.c_str());
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	259 }
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	260 break;
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	261
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	262 default:
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	263 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	264 std::stringstream ss;
3489 e7723a39adf8 Fixed alignment issue in Toolbox::DetectEndianness() + made the internal logger Benjamin Golinvaux <bgo@osimis.io> parents: 3477 diff changeset	265 ss << "Unknown log level (" << level_ << ") for message: " << message;
3505 b2d4dd16dae8 removed C++11 primitive Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	266 std::string s = ss.str();
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	267 globalErrorLogFunc(s.c_str());
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	268 }
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	269 }
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
3358 849c651c1381 fix missing symbol Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	272 void Initialize()
849c651c1381 fix missing symbol Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	273 {
849c651c1381 fix missing symbol Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	274 }
849c651c1381 fix missing symbol Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	275
3995 1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	276 void Finalize()
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	277 {
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	278 }
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	279
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	280 void Reset()
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	281 {
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	282 }
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	283
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	284 void Flush()
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	285 {
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	286 }
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	287
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	288 void EnableInfoLevel(bool enabled)
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	289 {
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	290 globalVerbose_ = enabled;
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	291 }
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	292
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	293 bool IsInfoLevelEnabled()
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	294 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	295 return globalVerbose_;
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	296 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	297
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	298 void EnableTraceLevel(bool enabled)
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	299 {
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	300 globalTrace_ = enabled;
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	301 }
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	302
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	303 bool IsTraceLevelEnabled()
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	304 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	305 return globalTrace_;
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	306 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	307
3995 1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	308 void SetTargetFile(const std::string& path)
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 }
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	311
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	312 void SetTargetFolder(const std::string& path)
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 }
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 }
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	317
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	318
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	319 #elif ORTHANC_ENABLE_LOGGING_PLUGIN == 1
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	320
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 * Logger compatible with the Orthanc plugin SDK
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
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	325 #include <cassert>
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	326
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	327 namespace
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	328 {
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	329 /**
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	330 * This is minimal implementation of the context for an Orthanc
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	331 * plugin, limited to the logging facilities, and that is binary
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	332 * compatible with the definitions of "OrthancCPlugin.h"
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	333 **/
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	334 typedef enum
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	335 {
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	336 _OrthancPluginService_LogInfo = 1,
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	337 _OrthancPluginService_LogWarning = 2,
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	338 _OrthancPluginService_LogError = 3,
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	339 _OrthancPluginService_INTERNAL = 0x7fffffff
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	340 } _OrthancPluginService;
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	341
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	342 typedef struct _OrthancPluginContext_t
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	343 {
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	344 void* pluginsManager;
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	345 const char* orthancVersion;
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	346 void (Free) (void buffer);
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	347 int32_t (InvokeService) (struct _OrthancPluginContext_t context,
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	348 _OrthancPluginService service,
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	349 const void* params);
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	350 } OrthancPluginContext;
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	351 }
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	352
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	353
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	354 #include <boost/lexical_cast.hpp>
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	355 #include <sstream>
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	356
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	357 namespace Orthanc
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	358 {
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	359 namespace Logging
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	360 {
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	361 static OrthancPluginContext* context_ = NULL;
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	362
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	363 void Initialize(void* context)
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	364 {
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	365 assert(sizeof(_OrthancPluginService) == sizeof(int32_t));
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	366 context_ = reinterpret_cast<OrthancPluginContext*>(context);
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	367 }
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	368
3998 b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	369 InternalLogger::InternalLogger(LogLevel level,
3995 1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	370 const char* file /* ignored */,
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	371 int line /* ignored */) :
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	372 level_(level)
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	373 {
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	374 }
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	375
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	376 InternalLogger::~InternalLogger()
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	377 {
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	378 std::string message = messageStream_.str();
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	379 if (context_ != NULL)
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	380 {
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	381 switch (level_)
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	382 {
3998 b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	383 case LogLevel_ERROR:
3995 1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	384 context_->InvokeService(context_, _OrthancPluginService_LogError, message.c_str());
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	385 break;
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	386
3998 b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	387 case LogLevel_WARNING:
3995 1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	388 context_->InvokeService(context_, _OrthancPluginService_LogWarning, message.c_str());
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	389 break;
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	390
3998 b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	391 case LogLevel_INFO:
3995 1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	392 context_->InvokeService(context_, _OrthancPluginService_LogInfo, message.c_str());
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	393 break;
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	394
3998 b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	395 case LogLevel_TRACE:
3995 1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	396 // Not used by plugins
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	397 break;
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	398
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	399 default:
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	400 {
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	401 std::string s = ("Unknown log level (" + boost::lexical_cast<std::string>(level_) +
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	402 ") for message: " + message);
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	403 context_->InvokeService(context_, _OrthancPluginService_LogInfo, s.c_str());
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	404 break;
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	405 }
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	406 }
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	407 }
1f405a3fdeca reorganizing Logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 3712 diff changeset	408 }
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	409 }
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	410 }
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	411
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	412
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	413 #else /* ORTHANC_ENABLE_LOGGING_PLUGIN == 0 &&
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	414 ORTHANC_ENABLE_LOGGING_STDIO == 0 &&
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	415 ORTHANC_ENABLE_LOGGING == 1 */
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	416
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	417 /*********************************************************
2014 e39a2657f1c6 Dropped support of Google Log Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	418 * Internal logger of Orthanc, that mimics some
e39a2657f1c6 Dropped support of Google Log Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	419 * behavior from Google Log.
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	420 *********************************************************/
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	421
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	422 #include "Compatibility.h"
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	423 #include "Enumerations.h"
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	424 #include "Toolbox.h"
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	425
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	426 #if ORTHANC_SANDBOXED == 1
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	427 # include <stdio.h>
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	428 #else
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	429 # include "SystemToolbox.h"
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	430 #endif
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	431
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	432 #include <fstream>
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	433 #include <boost/filesystem.hpp>
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	434 #include <boost/thread.hpp>
2367 2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2253 diff changeset	435 #include <boost/date_time/posix_time/posix_time.hpp>
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	436
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	437
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	438 namespace
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	439 {
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	440 struct LoggingContext
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	441 {
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	442 bool infoEnabled_;
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	443 bool traceEnabled_;
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	444 std::string targetFile_;
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	445 std::string targetFolder_;
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	446
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	447 std::ostream* error_;
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	448 std::ostream* warning_;
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	449 std::ostream* info_;
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	450
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	451 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	452
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	453 LoggingContext() :
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	454 infoEnabled_(false),
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	455 traceEnabled_(false),
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	456 error_(&std::cerr),
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	457 warning_(&std::cerr),
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	458 info_(&std::cerr)
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	459 {
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	460 }
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	461 };
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	462
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	463 struct LoggingMementoImpl
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	464 {
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	465 bool valid_;
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	466 bool infoEnabled_;
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	467 bool traceEnabled_;
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	468 std::string targetFile_;
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	469 std::string targetFolder_;
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	470
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	471 std::ostream* error_;
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	472 std::ostream* warning_;
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	473 std::ostream* info_;
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	474 };
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	475 }
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	476
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	477
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	478
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	479 static std::unique_ptr<LoggingContext> loggingContext_;
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	480 static boost::mutex loggingMutex_;
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	481
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	482
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	483
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	484 namespace Orthanc
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	485 {
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	486 namespace Logging
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	487 {
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	488 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	489 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	490 const std::string& suffix,
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	491 const std::string& directory)
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	492 {
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	493 /**
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	494 From Google Log documentation:
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	495
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	496 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	497 "<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	498 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	499 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	500
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	501 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	502 **/
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	503
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	504 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	505 boost::filesystem::path root(directory);
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2134 diff changeset	506 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	507
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	508 if (!boost::filesystem::exists(root) \|\|
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	509 !boost::filesystem::is_directory(root))
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	510 {
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	511 throw OrthancException(ErrorCode_CannotWriteFile);
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	512 }
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	513
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	514 char date[64];
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	515 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	516 static_cast<int>(now.date().year()),
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	517 now.date().month().as_number(),
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	518 now.date().day().as_number(),
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	519 static_cast<int>(now.time_of_day().hours()),
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	520 static_cast<int>(now.time_of_day().minutes()),
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	521 static_cast<int>(now.time_of_day().seconds()),
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2134 diff changeset	522 SystemToolbox::GetProcessId());
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	523
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	524 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	525
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	526 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	527 link = (root / (programName + ".log" + suffix));
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	528 }
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	529
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	530
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	531 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	532 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	533 const std::string& directory)
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	534 {
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	535 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	536 GetLogPath(log, link, suffix, directory);
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	537
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	538 #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	539 boost::filesystem::remove(link);
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	540 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	541 #endif
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	542
1494 a13581480b1f fix mingw build Sebastien Jodogne <s.jodogne@gmail.com> parents: 1490 diff changeset	543 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	544 }
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	545
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	546
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	547 void Initialize()
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	548 {
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	549 boost::mutex::scoped_lock lock(loggingMutex_);
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	550 loggingContext_.reset(new LoggingContext);
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	551 }
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	552
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	553 void Finalize()
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	554 {
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	555 boost::mutex::scoped_lock lock(loggingMutex_);
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	556 loggingContext_.reset(NULL);
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	557 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	558
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	559 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	560 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	561 // Recover the old logging context
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	562 std::unique_ptr<LoggingContext> 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	563
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 boost::mutex::scoped_lock lock(loggingMutex_);
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	566 if (loggingContext_.get() == NULL)
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	567 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	568 return;
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	569 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	570 else
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	571 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	572 #if __cplusplus < 201103L
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	573 old.reset(loggingContext_.release());
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	574 #else
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	575 old = std::move(loggingContext_);
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	576 #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	577
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	578 // Create a new logging context,
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	579 loggingContext_.reset(new LoggingContext);
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	580 }
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
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	583 EnableInfoLevel(old->infoEnabled_);
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	584 EnableTraceLevel(old->traceEnabled_);
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	585
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	586 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	587 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	588 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	589 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	590 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	591 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	592 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	593 }
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	594 }
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	595
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	596
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	597 LoggingMemento CreateLoggingMemento()
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	598 {
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	599 LoggingMementoImpl* memento = new LoggingMementoImpl();
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	600
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	601 memento->valid_ = true;
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	602 {
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	603 boost::mutex::scoped_lock lock(loggingMutex_);
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	604 memento->infoEnabled_ = loggingContext_->infoEnabled_;
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	605 memento->traceEnabled_ = loggingContext_->traceEnabled_;
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	606 memento->targetFile_ = loggingContext_->targetFile_;
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	607 memento->targetFolder_ = loggingContext_->targetFolder_;
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	608
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	609 memento->error_ = loggingContext_->error_;
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	610 memento->warning_ = loggingContext_->warning_;
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	611 memento->info_ = loggingContext_->info_;
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	612 }
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	613 return reinterpret_cast<void*>(memento);
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	614 }
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	615
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	616 void RestoreLoggingMemento(LoggingMemento mementoPtr)
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	617 {
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	618 LoggingMementoImpl* memento =
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	619 reinterpret_cast<LoggingMementoImpl*>(mementoPtr);
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	620 if (!memento->valid_)
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	621 throw std::runtime_error("Memento already used");
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	622 memento->valid_ = false;
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	623 std::unique_ptr<LoggingMementoImpl> deleter(memento);
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	624 {
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	625 boost::mutex::scoped_lock lock(loggingMutex_);
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	626 loggingContext_.reset(new LoggingContext);
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	627 loggingContext_->error_ = memento->error_;
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	628 loggingContext_->warning_ = memento->warning_;
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	629 loggingContext_->info_ = memento->info_;
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	630 }
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	631 EnableInfoLevel(memento->infoEnabled_);
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	632 EnableTraceLevel(memento->traceEnabled_);
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	633 if (!memento->targetFolder_.empty())
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	634 {
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	635 SetTargetFolder(memento->targetFolder_);
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	636 }
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	637 else if (!memento->targetFile_.empty())
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	638 {
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	639 SetTargetFile(memento->targetFile_);
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	640 }
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	641 }
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	642
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	643 void DiscardLoggingMemento(LoggingMemento mementoPtr)
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	644 {
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	645 LoggingMementoImpl* memento =
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	646 reinterpret_cast<LoggingMementoImpl*>(mementoPtr);
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	647 delete memento;
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	648 }
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	649
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	650 void EnableInfoLevel(bool enabled)
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	651 {
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	652 boost::mutex::scoped_lock lock(loggingMutex_);
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	653 assert(loggingContext_.get() != NULL);
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	654
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	655 loggingContext_->infoEnabled_ = enabled;
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	656
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	657 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	658 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	659 // Also disable the "TRACE" level when info-level debugging is disabled
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	660 loggingContext_->traceEnabled_ = false;
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	661 }
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	662 }
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	663
3629 19966d299685 Fixed typo in function impl name Benjamin Golinvaux <bgo@osimis.io> parents: 3506 diff changeset	664 bool IsInfoLevelEnabled()
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	665 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	666 boost::mutex::scoped_lock lock(loggingMutex_);
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	667 assert(loggingContext_.get() != NULL);
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	668
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	669 return loggingContext_->infoEnabled_;
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	670 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	671
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	672 void EnableTraceLevel(bool enabled)
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	673 {
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	674 boost::mutex::scoped_lock lock(loggingMutex_);
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	675 assert(loggingContext_.get() != NULL);
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	676
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	677 loggingContext_->traceEnabled_ = enabled;
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	678
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	679 if (enabled)
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	680 {
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	681 // Also enable the "INFO" level when trace-level debugging is 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	682 loggingContext_->infoEnabled_ = true;
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	683 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	684 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	685
3629 19966d299685 Fixed typo in function impl name Benjamin Golinvaux <bgo@osimis.io> parents: 3506 diff changeset	686 bool IsTraceLevelEnabled()
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	687 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	688 boost::mutex::scoped_lock lock(loggingMutex_);
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	689 assert(loggingContext_.get() != NULL);
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	690
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	691 return loggingContext_->traceEnabled_;
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	692 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	693
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	694
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	695 static void CheckFile(std::unique_ptr<std::ofstream>& f)
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	696 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	697 if (loggingContext_->file_.get() == NULL \|\|
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	698 !loggingContext_->file_->is_open())
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	699 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	700 throw OrthancException(ErrorCode_CannotWriteFile);
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	701 }
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	702 }
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	703
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	704 void SetTargetFolder(const std::string& path)
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	705 {
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	706 boost::mutex::scoped_lock lock(loggingMutex_);
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	707 assert(loggingContext_.get() != NULL);
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	708
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	709 PrepareLogFolder(loggingContext_->file_, "" /* no suffix */, path);
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	710 CheckFile(loggingContext_->file_);
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	711
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	712 loggingContext_->targetFile_.clear();
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	713 loggingContext_->targetFolder_ = path;
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	714 loggingContext_->warning_ = loggingContext_->file_.get();
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	715 loggingContext_->error_ = loggingContext_->file_.get();
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	716 loggingContext_->info_ = loggingContext_->file_.get();
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	717 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	718
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	719
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	720 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	721 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	722 boost::mutex::scoped_lock lock(loggingMutex_);
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	723 assert(loggingContext_.get() != NULL);
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	724
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	725 loggingContext_->file_.reset(new std::ofstream(path.c_str(), std::fstream::app));
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	726 CheckFile(loggingContext_->file_);
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	727
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	728 loggingContext_->targetFile_ = path;
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	729 loggingContext_->targetFolder_.clear();
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	730 loggingContext_->warning_ = loggingContext_->file_.get();
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	731 loggingContext_->error_ = loggingContext_->file_.get();
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	732 loggingContext_->info_ = loggingContext_->file_.get();
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	733 }
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	734
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	735
3998 b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	736 InternalLogger::InternalLogger(LogLevel level,
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	737 const char* file,
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	738 int line) :
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	739 lock_(loggingMutex_),
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	740 stream_(&null_) // By default, logging to "/dev/null" is simulated
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	741 {
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	742 if (loggingContext_.get() == NULL)
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	743 {
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	744 fprintf(stderr, "ERROR: Trying to log a message after the finalization of the logging engine\n");
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	745 return;
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	746 }
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	747
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	748 try
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	749 {
3998 b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	750 if ((level == LogLevel_INFO && !loggingContext_->infoEnabled_) \|\|
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	751 (level == LogLevel_TRACE && !loggingContext_->traceEnabled_))
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	752 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	753 // This logging level is disabled, directly exit and unlock
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	754 // the mutex to speed-up things. The stream is set to "/dev/null"
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	755 lock_.unlock();
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	756 return;
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	757 }
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	758
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	759 // Compute the header of the line, temporary release the lock as
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	760 // this is a time-consuming operation
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	761 lock_.unlock();
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	762 std::string header;
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	763
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	764 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	765 boost::filesystem::path path(file);
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	766 boost::posix_time::ptime now = boost::posix_time::microsec_clock::local_time();
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	767 boost::posix_time::time_duration duration = now.time_of_day();
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	768
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	769 /**
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	770 From Google Log documentation:
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	771
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	772 "Log lines have this form:
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	773
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	774 Lmmdd hh:mm:ss.uuuuuu threadid file:line] msg...
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	775
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	776 where the fields are defined as follows:
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	777
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	778 L A single character, representing the log level (eg 'I' for INFO)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	779 mm The month (zero padded; ie May is '05')
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	780 dd The day (zero padded)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	781 hh:mm:ss.uuuuuu Time in hours, minutes and fractional seconds
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	782 threadid The space-padded thread ID as returned by GetTID() (this matches the PID on Linux)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	783 file The file name
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	784 line The line number
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	785 msg The user-supplied message"
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	786
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	787 In this implementation, "threadid" is not printed.
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	788 **/
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	789
3998 b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	790 char prefix;
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	791 switch (level)
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	792 {
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	793 case LogLevel_ERROR:
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	794 prefix = 'E';
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	795 break;
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	796
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	797 case LogLevel_WARNING:
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	798 prefix = 'W';
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	799 break;
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	800
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	801 case LogLevel_INFO:
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	802 prefix = 'I';
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	803 break;
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	804
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	805 case LogLevel_TRACE:
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	806 prefix = 'T';
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	807 break;
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	808
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	809 default:
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	810 throw OrthancException(ErrorCode_InternalError);
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	811 }
b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	812
3477 a4f2354f04c3 fix warning from gcc 8.3.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3469 diff changeset	813 char date[64];
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	814 sprintf(date, "%c%02d%02d %02d:%02d:%02d.%06d ",
3998 b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	815 prefix,
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	816 now.date().month().as_number(),
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	817 now.date().day().as_number(),
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	818 static_cast<int>(duration.hours()),
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	819 static_cast<int>(duration.minutes()),
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	820 static_cast<int>(duration.seconds()),
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	821 static_cast<int>(duration.fractional_seconds()));
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	822
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	823 header = std::string(date) + path.filename().string() + ":" + boost::lexical_cast<std::string>(line) + "] ";
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	824 }
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	825
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	826
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	827 // The header is computed, we now re-lock the mutex to access
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	828 // the stream objects. Pay attention that "loggingContext_",
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	829 // "infoEnabled_" or "traceEnabled_" might have changed while
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	830 // the mutex was unlocked.
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	831 lock_.lock();
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	832
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	833 if (loggingContext_.get() == NULL)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	834 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	835 fprintf(stderr, "ERROR: Trying to log a message after the finalization of the logging engine\n");
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	836 return;
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	837 }
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	838
3998 b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	839 switch (level)
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	840 {
3998 b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	841 case LogLevel_ERROR:
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	842 stream_ = loggingContext_->error_;
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	843 break;
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	844
3998 b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	845 case LogLevel_WARNING:
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	846 stream_ = loggingContext_->warning_;
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	847 break;
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	848
3998 b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	849 case LogLevel_INFO:
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	850 if (loggingContext_->infoEnabled_)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	851 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	852 stream_ = loggingContext_->info_;
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	853 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	854
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	855 break;
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	856
3998 b3f09bc9734b sharing more code between the loggers Sebastien Jodogne <s.jodogne@gmail.com> parents: 3996 diff changeset	857 case LogLevel_TRACE:
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	858 if (loggingContext_->traceEnabled_)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	859 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	860 stream_ = loggingContext_->info_;
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	861 }
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	862
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	863 break;
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	864
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	865 default:
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	866 throw OrthancException(ErrorCode_InternalError);
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	867 }
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	868
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	869 if (stream_ == &null_)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	870 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	871 // The logging is disabled for this level. The stream is the
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	872 // "null_" member of this object, so we can release the global
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	873 // mutex.
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	874 lock_.unlock();
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	875 }
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	876
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	877 (*stream_) << header;
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	878 }
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	879 catch (...)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	880 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	881 // Something is going really wrong, probably running out of
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	882 // memory. Fallback to a degraded mode.
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	883 stream_ = loggingContext_->error_;
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	884 (*stream_) << "E???? ??:??:??.?????? ] ";
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	885 }
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	886 }
1507 46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	887
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	888
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	889 InternalLogger::~InternalLogger()
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	890 {
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	891 if (stream_ != &null_)
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	892 {
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	893 *stream_ << "\n";
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	894 stream_->flush();
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	895 }
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	896 }
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	897
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	898
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	899 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	900 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	901 boost::mutex::scoped_lock lock(loggingMutex_);
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	902
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	903 if (loggingContext_.get() != NULL &&
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	904 loggingContext_->file_.get() != NULL)
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	905 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	906 loggingContext_->file_->flush();
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	907 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	908 }
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	909
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	910 void SetErrorWarnInfoLoggingStreams(std::ostream* errorStream,
4002 02e61695cd83 style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3998 diff changeset	911 std::ostream* warningStream,
02e61695cd83 style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3998 diff changeset	912 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	913 {
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	914 boost::mutex::scoped_lock lock(loggingMutex_);
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	915 std::unique_ptr<LoggingContext> old;
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	916
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	917 #if __cplusplus < 201103L
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	918 old.reset(loggingContext_.release());
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	919 #else
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	920 old = std::move(loggingContext_);
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	921 #endif
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	922
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	923 loggingContext_.reset(new LoggingContext);
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	924 loggingContext_->error_ = errorStream;
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	925 loggingContext_->warning_ = warningStream;
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	926 loggingContext_->info_ = infoStream;
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	927 lock.unlock();
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	928 EnableInfoLevel(old->infoEnabled_);
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	929 EnableTraceLevel(old->traceEnabled_);
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	930 }
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	931
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	932 #ifdef __EMSCRIPTEN__
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	933
4002 02e61695cd83 style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3998 diff changeset	934 static FuncStreamBuf<decltype(emscripten_console_error)>
02e61695cd83 style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3998 diff changeset	935 globalEmscriptenErrorStreamBuf_(emscripten_console_error);
02e61695cd83 style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3998 diff changeset	936 static std::unique_ptr<std::ostream> globalEmscriptenErrorStream_;
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	937
4002 02e61695cd83 style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3998 diff changeset	938 static FuncStreamBuf<decltype(emscripten_console_warn)>
02e61695cd83 style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3998 diff changeset	939 globalEmscriptenWarningStreamBuf_(emscripten_console_warn);
02e61695cd83 style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3998 diff changeset	940 static std::unique_ptr<std::ostream> globalEmscriptenWarningStream_;
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	941
4002 02e61695cd83 style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3998 diff changeset	942 static FuncStreamBuf<decltype(emscripten_console_log)>
02e61695cd83 style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3998 diff changeset	943 globalEmscriptenInfoStreamBuf_(emscripten_console_log);
02e61695cd83 style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3998 diff changeset	944 static std::unique_ptr<std::ostream> globalEmscriptenInfoStream_;
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	945
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	946 void EnableEmscriptenLogging()
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	947 {
4002 02e61695cd83 style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3998 diff changeset	948 globalEmscriptenErrorStream_.reset(new ostream(&globalEmscriptenErrorStreamBuf_));
02e61695cd83 style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3998 diff changeset	949 globalEmscriptenWarningStream_.reset(new ostream(&globalEmscriptenWarningStreamBuf_));
02e61695cd83 style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3998 diff changeset	950 globalEmscriptenInfoStream_.reset(new ostream(&globalEmscriptenInfoStreamBuf_));
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	951
4002 02e61695cd83 style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3998 diff changeset	952 SetErrorWarnInfoLoggingStreams(&globalEmscriptenErrorStream_,
02e61695cd83 style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3998 diff changeset	953 &globalEmscriptenWarningStream_,
02e61695cd83 style Sebastien Jodogne <s.jodogne@gmail.com> parents: 3998 diff changeset	954 &globalEmscriptenInfoStream_);
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	955 }
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	956 #endif
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	957 }
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	958 }
1488 c8763b603b0e flag for plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1487 diff changeset	959
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	960
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	961 #endif // ORTHANC_ENABLE_LOGGING

Mercurial > hg > orthanc

annotate Core/Logging.cpp @ 4002:02e61695cd83