orthanc: Core/Logging.cpp annotate

annotate Core/Logging.cpp @ 3837:963ea9fab402

merge

author	Sebastien Jodogne <s.jodogne@gmail.com>
date	Wed, 15 Apr 2020 17:28:27 +0200
parents	2a170a8f1faf
children	1f405a3fdeca

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
1551 0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	37 #if ORTHANC_ENABLE_LOGGING != 1
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	38
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	39 namespace Orthanc
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	40 {
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	41 namespace Logging
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	42 {
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	43 void Initialize()
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	44 {
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	45 }
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	46
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	47 void Finalize()
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	48 {
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	49 }
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	50
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	51 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	52 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	53 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	54
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	55 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	56 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	57 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	58
1551 0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	59 void EnableInfoLevel(bool enabled)
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	60 {
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	61 }
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	62
1551 0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	63 void EnableTraceLevel(bool enabled)
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	64 {
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	65 }
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	66
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	67 bool IsTraceLevelEnabled()
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	68 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	69 return false;
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	70 }
1551 0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	71
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	72 bool IsInfoLevelEnabled()
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	73 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	74 return false;
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	75 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	76
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	77 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	78 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	79 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	80
1551 0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	81 void SetTargetFolder(const std::string& path)
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	82 {
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	83 }
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	84 }
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	85 }
0dba274074eb standalone logging Sebastien Jodogne <s.jodogne@gmail.com> parents: 1507 diff changeset	86
2243 2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	87
2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	88 #elif ORTHANC_ENABLE_LOGGING_PLUGIN == 1
2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	89
2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	90 /*********************************************************
2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	91 * Logger compatible with the Orthanc plugin SDK
2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	92 *********************************************************/
2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	93
2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	94 #include <boost/lexical_cast.hpp>
3489 e7723a39adf8 Fixed alignment issue in Toolbox::DetectEndianness() + made the internal logger Benjamin Golinvaux <bgo@osimis.io> parents: 3477 diff changeset	95 #include <sstream>
2243 2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	96
2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	97 namespace Orthanc
2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	98 {
2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	99 namespace Logging
2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	100 {
2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	101 static OrthancPluginContext* context_ = NULL;
2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	102
2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	103 void Initialize(OrthancPluginContext* context)
2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	104 {
2253 441352e7a9d1 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	105 context_ = context;
2243 2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	106 }
2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	107
2505 a4f885670da7 fix Windows build Sebastien Jodogne <s.jodogne@gmail.com> parents: 2498 diff changeset	108 InternalLogger::InternalLogger(InternalLevel level,
2243 2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	109 const char* file /* ignored */,
2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	110 int line /* ignored */) :
2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	111 level_(level)
2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	112 {
2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	113 }
2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	114
2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	115 InternalLogger::~InternalLogger()
2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	116 {
3489 e7723a39adf8 Fixed alignment issue in Toolbox::DetectEndianness() + made the internal logger Benjamin Golinvaux <bgo@osimis.io> parents: 3477 diff changeset	117 std::string message = messageStream_.str();
2243 2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	118 if (context_ != NULL)
2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	119 {
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	120 switch (level_)
2243 2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	121 {
2505 a4f885670da7 fix Windows build Sebastien Jodogne <s.jodogne@gmail.com> parents: 2498 diff changeset	122 case InternalLevel_ERROR:
3489 e7723a39adf8 Fixed alignment issue in Toolbox::DetectEndianness() + made the internal logger Benjamin Golinvaux <bgo@osimis.io> parents: 3477 diff changeset	123 OrthancPluginLogError(context_, message.c_str());
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	124 break;
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	125
2505 a4f885670da7 fix Windows build Sebastien Jodogne <s.jodogne@gmail.com> parents: 2498 diff changeset	126 case InternalLevel_WARNING:
3489 e7723a39adf8 Fixed alignment issue in Toolbox::DetectEndianness() + made the internal logger Benjamin Golinvaux <bgo@osimis.io> parents: 3477 diff changeset	127 OrthancPluginLogWarning(context_, message.c_str());
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	128 break;
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	129
2505 a4f885670da7 fix Windows build Sebastien Jodogne <s.jodogne@gmail.com> parents: 2498 diff changeset	130 case InternalLevel_INFO:
3489 e7723a39adf8 Fixed alignment issue in Toolbox::DetectEndianness() + made the internal logger Benjamin Golinvaux <bgo@osimis.io> parents: 3477 diff changeset	131 OrthancPluginLogInfo(context_, message.c_str());
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	132 break;
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	133
2505 a4f885670da7 fix Windows build Sebastien Jodogne <s.jodogne@gmail.com> parents: 2498 diff changeset	134 case InternalLevel_TRACE:
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	135 // Not used by plugins
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	136 break;
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	137
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	138 default:
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	139 {
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	140 std::string s = ("Unknown log level (" + boost::lexical_cast<std::string>(level_) +
3489 e7723a39adf8 Fixed alignment issue in Toolbox::DetectEndianness() + made the internal logger Benjamin Golinvaux <bgo@osimis.io> parents: 3477 diff changeset	141 ") for message: " + message);
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	142 OrthancPluginLogError(context_, s.c_str());
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	143 break;
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	144 }
2253 441352e7a9d1 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 2244 diff changeset	145 }
2243 2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	146 }
2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	147 }
2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	148 }
2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	149 }
2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	150
2dbfdafc2512 Logger compatible with the Orthanc plugin SDK Sebastien Jodogne <s.jodogne@gmail.com> parents: 2143 diff changeset	151
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	152 #elif ORTHANC_ENABLE_LOGGING_STDIO == 1
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	153
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 * 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	156 * 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	157 * definition of __EMSCRIPTEN__)
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	158 *********************************************************/
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	159
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	160 #include <stdio.h>
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	161 #include <boost/lexical_cast.hpp>
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	162
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	163 #ifdef __EMSCRIPTEN__
3506 d2b9981017c4 better handling of HTTP security Sebastien Jodogne <s.jodogne@gmail.com> parents: 3505 diff changeset	164 # 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	165 #endif
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	166
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	167 namespace Orthanc
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	168 {
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	169 namespace Logging
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	170 {
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	171 static bool globalVerbose_ = false;
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	172 static bool globalTrace_ = false;
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	173
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	174 #ifdef __EMSCRIPTEN__
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	175 void defaultErrorLogFunc(const char* msg)
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	176 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	177 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	178 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	179
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	180 void defaultWarningLogFunc(const char* msg)
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	181 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	182 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	183 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	184
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	185 void defaultInfoLogFunc(const char* msg)
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	186 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	187 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	188 }
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 void defaultTraceLogFunc(const char* 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 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	193 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	194 #else
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	195 // __EMSCRIPTEN__ not #defined
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	196 void defaultErrorLogFunc(const char* msg)
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	197 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	198 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	199 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	200
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	201 void defaultWarningLogFunc(const char*)
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	202 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	203 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	204 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	205
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	206 void defaultInfoLogFunc(const char*)
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	207 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	208 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	209 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	210
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	211 void defaultTraceLogFunc(const char*)
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	212 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	213 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	214 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	215 #endif
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	216 // __EMSCRIPTEN__
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	217
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	218 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	219 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	220 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	221 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	222
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	223 void SetErrorWarnInfoTraceLoggingFunctions(
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	224 LoggingFunction errorLogFunc,
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	225 LoggingFunction warningLogfunc,
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	226 LoggingFunction infoLogFunc,
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	227 LoggingFunction traceLogFunc)
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	228 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	229 globalErrorLogFunc = errorLogFunc;
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	230 globalWarningLogFunc = warningLogfunc;
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	231 globalInfoLogFunc = infoLogFunc;
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	232 globalTraceLogFunc = traceLogFunc;
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	233 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	234
2505 a4f885670da7 fix Windows build Sebastien Jodogne <s.jodogne@gmail.com> parents: 2498 diff changeset	235 InternalLogger::InternalLogger(InternalLevel level,
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	236 const char* file /* ignored */,
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	237 int line /* ignored */) :
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	238 level_(level)
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	239 {
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	240 }
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	241
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	242 InternalLogger::~InternalLogger()
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	243 {
3489 e7723a39adf8 Fixed alignment issue in Toolbox::DetectEndianness() + made the internal logger Benjamin Golinvaux <bgo@osimis.io> parents: 3477 diff changeset	244 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	245
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	246 switch (level_)
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	247 {
2505 a4f885670da7 fix Windows build Sebastien Jodogne <s.jodogne@gmail.com> parents: 2498 diff changeset	248 case InternalLevel_ERROR:
3489 e7723a39adf8 Fixed alignment issue in Toolbox::DetectEndianness() + made the internal logger Benjamin Golinvaux <bgo@osimis.io> parents: 3477 diff changeset	249 globalErrorLogFunc(message.c_str());
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	250 break;
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	251
2505 a4f885670da7 fix Windows build Sebastien Jodogne <s.jodogne@gmail.com> parents: 2498 diff changeset	252 case InternalLevel_WARNING:
3489 e7723a39adf8 Fixed alignment issue in Toolbox::DetectEndianness() + made the internal logger Benjamin Golinvaux <bgo@osimis.io> parents: 3477 diff changeset	253 globalWarningLogFunc(message.c_str());
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	254 break;
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	255
2505 a4f885670da7 fix Windows build Sebastien Jodogne <s.jodogne@gmail.com> parents: 2498 diff changeset	256 case InternalLevel_INFO:
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	257 if (globalVerbose_)
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	258 {
3489 e7723a39adf8 Fixed alignment issue in Toolbox::DetectEndianness() + made the internal logger Benjamin Golinvaux <bgo@osimis.io> parents: 3477 diff changeset	259 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	260 // TODO: stone_console_info(message_.c_str());
2483 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 break;
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	263
2505 a4f885670da7 fix Windows build Sebastien Jodogne <s.jodogne@gmail.com> parents: 2498 diff changeset	264 case InternalLevel_TRACE:
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	265 if (globalTrace_)
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	266 {
3489 e7723a39adf8 Fixed alignment issue in Toolbox::DetectEndianness() + made the internal logger Benjamin Golinvaux <bgo@osimis.io> parents: 3477 diff changeset	267 globalTraceLogFunc(message.c_str());
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	268 }
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	269 break;
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 default:
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	272 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	273 std::stringstream ss;
3489 e7723a39adf8 Fixed alignment issue in Toolbox::DetectEndianness() + made the internal logger Benjamin Golinvaux <bgo@osimis.io> parents: 3477 diff changeset	274 ss << "Unknown log level (" << level_ << ") for message: " << message;
3505 b2d4dd16dae8 removed C++11 primitive Sebastien Jodogne <s.jodogne@gmail.com> parents: 3489 diff changeset	275 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	276 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	277 }
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	278 }
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	279 }
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	280
3358 849c651c1381 fix missing symbol Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	281 void Initialize()
849c651c1381 fix missing symbol Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	282 {
849c651c1381 fix missing symbol Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	283 }
849c651c1381 fix missing symbol Sebastien Jodogne <s.jodogne@gmail.com> parents: 3060 diff changeset	284
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	285 void EnableInfoLevel(bool enabled)
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	286 {
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	287 globalVerbose_ = enabled;
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	288 }
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	289
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	290 bool IsInfoLevelEnabled()
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	291 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	292 return globalVerbose_;
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	293 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	294
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	295 void EnableTraceLevel(bool enabled)
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	296 {
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	297 globalTrace_ = enabled;
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	298 }
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	299
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	300 bool IsTraceLevelEnabled()
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	301 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	302 return globalTrace_;
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	303 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	304
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	305 }
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	306 }
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	307
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	308
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	309 #else /* ORTHANC_ENABLE_LOGGING_PLUGIN == 0 &&
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	310 ORTHANC_ENABLE_LOGGING_STDIO == 0 &&
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	311 ORTHANC_ENABLE_LOGGING == 1 */
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	312
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	313 /*********************************************************
2014 e39a2657f1c6 Dropped support of Google Log Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	314 * Internal logger of Orthanc, that mimics some
e39a2657f1c6 Dropped support of Google Log Sebastien Jodogne <s.jodogne@gmail.com> parents: 1900 diff changeset	315 * behavior from Google Log.
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	316 *********************************************************/
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	317
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	318 #include "Compatibility.h"
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	319 #include "OrthancException.h"
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	320 #include "Enumerations.h"
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	321 #include "Toolbox.h"
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	322
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	323 #if ORTHANC_SANDBOXED == 1
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	324 # include <stdio.h>
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	325 #else
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	326 # include "SystemToolbox.h"
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	327 #endif
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	328
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	329 #include <fstream>
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	330 #include <boost/filesystem.hpp>
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	331 #include <boost/thread.hpp>
2367 2aff870c2c58 refactoring of BoostConfiguration.cmake Sebastien Jodogne <s.jodogne@gmail.com> parents: 2253 diff changeset	332 #include <boost/date_time/posix_time/posix_time.hpp>
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	333
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	334
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	335 namespace
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	336 {
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	337 struct LoggingContext
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	338 {
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	339 bool infoEnabled_;
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	340 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	341 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	342 std::string targetFolder_;
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	343
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	344 std::ostream* error_;
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	345 std::ostream* warning_;
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	346 std::ostream* info_;
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	347
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	348 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	349
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	350 LoggingContext() :
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	351 infoEnabled_(false),
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	352 traceEnabled_(false),
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	353 error_(&std::cerr),
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	354 warning_(&std::cerr),
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	355 info_(&std::cerr)
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	356 {
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	357 }
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	358 };
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	359
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	360 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	361 {
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	362 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	363 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	364 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	365 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	366 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	367
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	368 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	369 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	370 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	371 };
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	372 }
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	373
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	374
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	375
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	376 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	377 static boost::mutex loggingMutex_;
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	378
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	379
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	380
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	381 namespace Orthanc
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	382 {
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	383 namespace Logging
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	384 {
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	385 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	386 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	387 const std::string& suffix,
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	388 const std::string& directory)
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	389 {
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	390 /**
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	391 From Google Log documentation:
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	392
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	393 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	394 "<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	395 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	396 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	397
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	398 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	399 **/
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	400
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	401 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	402 boost::filesystem::path root(directory);
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2134 diff changeset	403 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	404
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	405 if (!boost::filesystem::exists(root) \|\|
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	406 !boost::filesystem::is_directory(root))
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	407 {
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	408 throw OrthancException(ErrorCode_CannotWriteFile);
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	409 }
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	410
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	411 char date[64];
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	412 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	413 static_cast<int>(now.date().year()),
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	414 now.date().month().as_number(),
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	415 now.date().day().as_number(),
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	416 static_cast<int>(now.time_of_day().hours()),
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	417 static_cast<int>(now.time_of_day().minutes()),
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	418 static_cast<int>(now.time_of_day().seconds()),
2140 aa4b8895cd23 reorganization Sebastien Jodogne <s.jodogne@gmail.com> parents: 2134 diff changeset	419 SystemToolbox::GetProcessId());
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	420
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	421 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	422
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	423 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	424 link = (root / (programName + ".log" + suffix));
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	425 }
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	426
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	427
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	428 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	429 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	430 const std::string& directory)
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	431 {
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	432 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	433 GetLogPath(log, link, suffix, directory);
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	434
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	435 #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	436 boost::filesystem::remove(link);
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	437 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	438 #endif
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	439
1494 a13581480b1f fix mingw build Sebastien Jodogne <s.jodogne@gmail.com> parents: 1490 diff changeset	440 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	441 }
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	442
596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	443
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	444 void Initialize()
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	445 {
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	446 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	447 loggingContext_.reset(new LoggingContext);
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	448 }
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	449
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	450 void Finalize()
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	451 {
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	452 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	453 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	454 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	455
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	456 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	457 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	458 // 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	459 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	460
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	461 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	462 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	463 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	464 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	465 return;
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	466 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	467 else
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	468 {
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	469 #if __cplusplus < 201103L
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	470 old.reset(loggingContext_.release());
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	471 #else
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	472 old = std::move(loggingContext_);
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	473 #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	474
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	475 // 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	476 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	477 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	478 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	479
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	480 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	481 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	482
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	483 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	484 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	485 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	486 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	487 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	488 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	489 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	490 }
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	491 }
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	492
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	493
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	494 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	495 {
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	496 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	497
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	498 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	499 {
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	500 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	501 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	502 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	503 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	504 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	505
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	506 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	507 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	508 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	509 }
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	510 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	511 }
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	512
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	513 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	514 {
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	515 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	516 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	517 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	518 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	519 memento->valid_ = false;
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	520 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	521 {
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	522 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	523 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	524 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	525 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	526 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	527 }
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	528 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	529 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	530 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	531 {
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	532 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	533 }
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	534 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	535 {
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	536 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	537 }
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	538 }
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	539
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	540 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	541 {
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	542 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	543 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	544 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	545 }
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	546
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	547 void EnableInfoLevel(bool enabled)
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 assert(loggingContext_.get() != NULL);
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	551
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	552 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	553
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	554 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	555 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	556 // 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	557 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	558 }
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	559 }
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	560
3629 19966d299685 Fixed typo in function impl name Benjamin Golinvaux <bgo@osimis.io> parents: 3506 diff changeset	561 bool IsInfoLevelEnabled()
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	562 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	563 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	564 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	565
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	566 return loggingContext_->infoEnabled_;
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	567 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	568
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	569 void EnableTraceLevel(bool enabled)
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	570 {
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	571 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	572 assert(loggingContext_.get() != NULL);
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	573
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	574 loggingContext_->traceEnabled_ = enabled;
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	575
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	576 if (enabled)
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	577 {
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	578 // 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	579 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	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
3629 19966d299685 Fixed typo in function impl name Benjamin Golinvaux <bgo@osimis.io> parents: 3506 diff changeset	583 bool IsTraceLevelEnabled()
3359 815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	584 {
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	585 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	586 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	587
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	588 return loggingContext_->traceEnabled_;
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	589 }
815b81142ff7 Enable custom logging functions to redirect to emscripten specific logging calls Benjamin Golinvaux <bgo@osimis.io> parents: 3353 diff changeset	590
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	591
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	592 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	593 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	594 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	595 !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	596 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	597 throw OrthancException(ErrorCode_CannotWriteFile);
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	598 }
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	599 }
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	600
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	601 void SetTargetFolder(const std::string& path)
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	602 {
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	603 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	604 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	605
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	606 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	607 CheckFile(loggingContext_->file_);
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	608
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	609 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	610 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	611 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	612 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	613 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	614 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	615
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	616
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	617 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	618 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	619 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	620 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	621
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	622 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	623 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	624
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	625 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	626 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	627 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	628 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	629 loggingContext_->info_ = loggingContext_->file_.get();
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	630 }
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	631
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	632
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	633 InternalLogger::InternalLogger(const char* level,
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	634 const char* file,
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	635 int line) :
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	636 lock_(loggingMutex_),
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	637 stream_(&null_) // By default, logging to "/dev/null" is simulated
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	638 {
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	639 if (loggingContext_.get() == NULL)
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	640 {
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	641 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	642 return;
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	643 }
1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	644
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	645 try
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	646 {
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	647 LogLevel l = StringToLogLevel(level);
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	648
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	649 if ((l == LogLevel_Info && !loggingContext_->infoEnabled_) \|\|
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	650 (l == LogLevel_Trace && !loggingContext_->traceEnabled_))
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	651 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	652 // 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	653 // 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	654 lock_.unlock();
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	655 return;
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	656 }
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	657
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	658 // 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	659 // this is a time-consuming operation
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	660 lock_.unlock();
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	661 std::string header;
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	662
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	663 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	664 boost::filesystem::path path(file);
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	665 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	666 boost::posix_time::time_duration duration = now.time_of_day();
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	667
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	668 /**
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	669 From Google Log documentation:
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	670
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	671 "Log lines have this form:
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	672
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	673 Lmmdd hh:mm:ss.uuuuuu threadid file:line] msg...
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	674
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	675 where the fields are defined as follows:
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	676
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	677 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	678 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	679 dd The day (zero padded)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	680 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	681 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	682 file The file name
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	683 line The line number
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	684 msg The user-supplied message"
1490 596927722403 support of --logdir by the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1489 diff changeset	685
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	686 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	687 **/
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	688
3477 a4f2354f04c3 fix warning from gcc 8.3.0 Sebastien Jodogne <s.jodogne@gmail.com> parents: 3469 diff changeset	689 char date[64];
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	690 sprintf(date, "%c%02d%02d %02d:%02d:%02d.%06d ",
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	691 level[0],
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	692 now.date().month().as_number(),
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	693 now.date().day().as_number(),
2483 9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	694 static_cast<int>(duration.hours()),
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	695 static_cast<int>(duration.minutes()),
9c54c40eaf25 logging primitives for WebAssembly Sebastien Jodogne <s.jodogne@gmail.com> parents: 2447 diff changeset	696 static_cast<int>(duration.seconds()),
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	697 static_cast<int>(duration.fractional_seconds()));
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	698
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	699 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	700 }
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	701
fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	702
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	703 // 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	704 // 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	705 // "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	706 // the mutex was unlocked.
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	707 lock_.lock();
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	708
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	709 if (loggingContext_.get() == NULL)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	710 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	711 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	712 return;
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	713 }
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	714
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	715 switch (l)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	716 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	717 case LogLevel_Error:
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	718 stream_ = loggingContext_->error_;
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	719 break;
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	720
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	721 case LogLevel_Warning:
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	722 stream_ = loggingContext_->warning_;
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	723 break;
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	724
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	725 case LogLevel_Info:
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	726 if (loggingContext_->infoEnabled_)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	727 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	728 stream_ = loggingContext_->info_;
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	729 }
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	730
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	731 break;
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	732
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	733 case LogLevel_Trace:
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	734 if (loggingContext_->traceEnabled_)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	735 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	736 stream_ = loggingContext_->info_;
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	737 }
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	738
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	739 break;
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	740
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	741 default:
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	742 throw OrthancException(ErrorCode_InternalError);
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	743 }
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	744
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	745 if (stream_ == &null_)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	746 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	747 // 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	748 // "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	749 // mutex.
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	750 lock_.unlock();
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	751 }
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	752
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	753 (*stream_) << header;
1495 fbe40117eb21 improve the performance of the internal logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1494 diff changeset	754 }
2134 ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	755 catch (...)
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	756 {
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	757 // 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	758 // memory. Fallback to a degraded mode.
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	759 stream_ = loggingContext_->error_;
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	760 (*stream_) << "E???? ??:??:??.?????? ] ";
ddc75c6c712d Avoid hard crash if not enough memory Sebastien Jodogne <s.jodogne@gmail.com> parents: 2015 diff changeset	761 }
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	762 }
1507 46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	763
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	764
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	765 InternalLogger::~InternalLogger()
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	766 {
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	767 if (stream_ != &null_)
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	768 {
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	769 *stream_ << "\n";
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	770 stream_->flush();
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	771 }
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	772 }
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	773
46b2794042d6 fix Sebastien Jodogne <s.jodogne@gmail.com> parents: 1495 diff changeset	774
2015 bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	775 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	776 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	777 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	778
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	779 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	780 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	781 {
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	782 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	783 }
bcc575732aef New option "--logfile" to output the Orthanc log to the given file Sebastien Jodogne <s.jodogne@gmail.com> parents: 2014 diff changeset	784 }
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	785
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	786 void SetErrorWarnInfoLoggingStreams(std::ostream* 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	787 std::ostream* 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	788 std::ostream* 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	789 {
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	790 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	791 std::unique_ptr<LoggingContext> old;
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	792
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	793 #if __cplusplus < 201103L
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	794 old.reset(loggingContext_.release());
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	795 #else
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	796 old = std::move(loggingContext_);
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	797 #endif
2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	798
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	799 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	800 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	801 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	802 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	803 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	804 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	805 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	806 }
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	807
54cdad5a7228 Added a public function that will use emscripten-specific logging functions when using its SDK + scaffolding work. Build and UT OK on msvc15 x64. Not actually tested under nix or emscripten yet Benjamin Golinvaux <bgo@osimis.io>* parents: 3060 diff changeset	808 #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	809
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	810 FuncStreamBuf<decltype(emscripten_console_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	811 globalEmscriptenErrorStreamBuf(emscripten_console_error);
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	812 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	813
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	814 FuncStreamBuf<decltype(emscripten_console_warn)>
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	815 globalEmscriptenWarningStreamBuf(emscripten_console_warn);
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	816 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	817
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	818 FuncStreamBuf<decltype(emscripten_console_log)>
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	819 globalEmscriptenInfoStreamBuf(emscripten_console_log);
3712 2a170a8f1faf replacing std::auto_ptr by std::unique_ptr Sebastien Jodogne <s.jodogne@gmail.com> parents: 3640 diff changeset	820 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	821
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	822 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	823 {
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	824 globalEmscriptenErrorStream.reset(new ostream(
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	825 &globalEmscriptenErrorStreamBuf));
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	826
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	827 globalEmscriptenWarningStream.reset(new ostream(
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	828 &globalEmscriptenWarningStreamBuf));
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	829
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	830 globalEmscriptenInfoStream.reset(new ostream(
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	831 &globalEmscriptenInfoStreamBuf));
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	832
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	833 SetErrorWarnInfoLoggingStreams(
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	834 &globalEmscriptenErrorStream,
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	835 &globalEmscriptenWarningStream
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	836 &globalEmscriptenInfoStream);
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	837 }
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	838 #endif
1485 27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	839 }
27661b33f624 Creation of Logging.h Sebastien Jodogne <s.jodogne@gmail.com> parents: diff changeset	840 }
1488 c8763b603b0e flag for plugins Sebastien Jodogne <s.jodogne@gmail.com> parents: 1487 diff changeset	841
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	842
1489 1389834e130f basic logger Sebastien Jodogne <s.jodogne@gmail.com> parents: 1488 diff changeset	843 #endif // ORTHANC_ENABLE_LOGGING

Mercurial > hg > orthanc

annotate Core/Logging.cpp @ 3837:963ea9fab402