From be77876f05d7e18bc5838b5b8ef13d33d951e16e Mon Sep 17 00:00:00 2001 From: Philippe Coval Date: Mon, 13 Mar 2017 09:39:46 +0100 Subject: [PATCH] resource: Disable logging if not enabled Curently without logging (LOGGING=False or undefined) some trace messages are appearing: 0: In entity handler wrapper: Now with this change those log lines are sent to null stream. Change-Id: I26892c7ca6efca025c24e762305d59589ca26543 Signed-off-by: Philippe Coval Reviewed-on: https://gerrit.iotivity.org/gerrit/17869 Tested-by: jenkins-iotivity Reviewed-by: Dan Mihai --- resource/oc_logger/cpp/oc_ostream_logger.cpp | 7 +++++++ resource/src/OCApi.cpp | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/resource/oc_logger/cpp/oc_ostream_logger.cpp b/resource/oc_logger/cpp/oc_ostream_logger.cpp index 8134940..270a4c1 100644 --- a/resource/oc_logger/cpp/oc_ostream_logger.cpp +++ b/resource/oc_logger/cpp/oc_ostream_logger.cpp @@ -67,7 +67,14 @@ try auto *target = reinterpret_cast(world); if(nullptr == world) + { +#ifdef TB_LOG target = &std::cout; +#else + static std::ostream nullstream(0); + target = &nullstream; +#endif + } oc_ostream_logger_ctx *my_ctx = new oc_ostream_logger_ctx(target); diff --git a/resource/src/OCApi.cpp b/resource/src/OCApi.cpp index 529573f..bc5c969 100644 --- a/resource/src/OCApi.cpp +++ b/resource/src/OCApi.cpp @@ -28,7 +28,12 @@ namespace OC { std::ostream& oclog() { +#ifdef TB_LOG return std::cout; +#else + static std::ostream nullstream(0); + return nullstream; +#endif } } #endif -- 2.7.4