Mercurial > hg > orthanc

comparison Core/Logging.cpp @ 4002:02e61695cd83

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
style
author Sebastien Jodogne <s.jodogne@gmail.com>
date Sat, 06 Jun 2020 10:58:36 +0200
parents b3f09bc9734b
children 3c19371090c3
comparison
equal deleted inserted replaced
4001:5d5662ff4d5c 4002:02e61695cd83
906 loggingContext_->file_->flush(); 906 loggingContext_->file_->flush();
907 } 907 }
908 } 908 }
909 909
910 void SetErrorWarnInfoLoggingStreams(std::ostream* errorStream, 910 void SetErrorWarnInfoLoggingStreams(std::ostream* errorStream,
911 std::ostream* warningStream, 911 std::ostream* warningStream,
912 std::ostream* infoStream) 912 std::ostream* infoStream)
913 { 913 {
914 boost::mutex::scoped_lock lock(loggingMutex_); 914 boost::mutex::scoped_lock lock(loggingMutex_);
915 std::unique_ptr<LoggingContext> old; 915 std::unique_ptr<LoggingContext> old;
916 916
917 #if __cplusplus < 201103L 917 #if __cplusplus < 201103L
929 EnableTraceLevel(old->traceEnabled_); 929 EnableTraceLevel(old->traceEnabled_);
930 } 930 }
931 931
932 #ifdef __EMSCRIPTEN__ 932 #ifdef __EMSCRIPTEN__
933 933
934 FuncStreamBuf<decltype(emscripten_console_error)> 934 static FuncStreamBuf<decltype(emscripten_console_error)>
935 globalEmscriptenErrorStreamBuf(emscripten_console_error); 935 globalEmscriptenErrorStreamBuf_(emscripten_console_error);
936 std::unique_ptr<std::ostream> globalEmscriptenErrorStream; 936 static std::unique_ptr<std::ostream> globalEmscriptenErrorStream_;
937 937
938 FuncStreamBuf<decltype(emscripten_console_warn)> 938 static FuncStreamBuf<decltype(emscripten_console_warn)>
939 globalEmscriptenWarningStreamBuf(emscripten_console_warn); 939 globalEmscriptenWarningStreamBuf_(emscripten_console_warn);
940 std::unique_ptr<std::ostream> globalEmscriptenWarningStream; 940 static std::unique_ptr<std::ostream> globalEmscriptenWarningStream_;
941 941
942 FuncStreamBuf<decltype(emscripten_console_log)> 942 static FuncStreamBuf<decltype(emscripten_console_log)>
943 globalEmscriptenInfoStreamBuf(emscripten_console_log); 943 globalEmscriptenInfoStreamBuf_(emscripten_console_log);
944 std::unique_ptr<std::ostream> globalEmscriptenInfoStream; 944 static std::unique_ptr<std::ostream> globalEmscriptenInfoStream_;
945 945
946 void EnableEmscriptenLogging() 946 void EnableEmscriptenLogging()
947 { 947 {
948 globalEmscriptenErrorStream.reset(new ostream( 948 globalEmscriptenErrorStream_.reset(new ostream(&globalEmscriptenErrorStreamBuf_));
949 &globalEmscriptenErrorStreamBuf)); 949 globalEmscriptenWarningStream_.reset(new ostream(&globalEmscriptenWarningStreamBuf_));
950 950 globalEmscriptenInfoStream_.reset(new ostream(&globalEmscriptenInfoStreamBuf_));
951 globalEmscriptenWarningStream.reset(new ostream( 951
952 &globalEmscriptenWarningStreamBuf)); 952 SetErrorWarnInfoLoggingStreams(&globalEmscriptenErrorStream_,
953 953 &globalEmscriptenWarningStream_,
954 globalEmscriptenInfoStream.reset(new ostream( 954 &globalEmscriptenInfoStream_);
955 &globalEmscriptenInfoStreamBuf));
956
957 SetErrorWarnInfoLoggingStreams(
958 &globalEmscriptenErrorStream,
959 &globalEmscriptenWarningStream
960 &globalEmscriptenInfoStream);
961 } 955 }
962 #endif 956 #endif
963 } 957 }
964 } 958 }
965 959