From 61837c0420781b601dd7fe8e62800b75869277db Mon Sep 17 00:00:00 2001 From: Pau Espin Pedrol Date: Tue, 20 Feb 2018 18:22:18 +0100 Subject: [PATCH] Logger: Remove gLogToConsole flag No code is using it and we always lock to console anyways. Change-Id: I5fde99c6af5a845e635b5d27abab855682071f14 --- CommonLibs/Logger.cpp | 22 ++++++++-------------- CommonLibs/Logger.h | 1 - 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/CommonLibs/Logger.cpp b/CommonLibs/Logger.cpp index b05e7fde..4c2a2d37 100644 --- a/CommonLibs/Logger.cpp +++ b/CommonLibs/Logger.cpp @@ -37,8 +37,6 @@ using namespace std; -// Switches to enable/disable logging targets -bool gLogToConsole = true; Mutex gLogToLock; // Global log level threshold: @@ -101,18 +99,14 @@ Log::~Log() if (mPriority <= LOG_ERR) { cerr << mStream.str() << endl; } - // Log to file and console - if (gLogToConsole) { - int mlen = mStream.str().size(); - int neednl = (mlen==0 || mStream.str()[mlen-1] != '\n'); - ScopedLock lock(gLogToLock); - if (gLogToConsole) { - // The COUT() macro prevents messages from stomping each other but adds uninteresting thread numbers, - // so just use std::cout. - std::cout << mStream.str(); - if (neednl) std::cout<<"\n"; - } - } + + int mlen = mStream.str().size(); + int neednl = (mlen==0 || mStream.str()[mlen-1] != '\n'); + ScopedLock lock(gLogToLock); + // The COUT() macro prevents messages from stomping each other but adds uninteresting thread numbers, + // so just use std::cout. + std::cout << mStream.str(); + if (neednl) std::cout<<"\n"; } ostringstream& Log::get() diff --git a/CommonLibs/Logger.h b/CommonLibs/Logger.h index 32ee891b..a8fe44de 100644 --- a/CommonLibs/Logger.h +++ b/CommonLibs/Logger.h @@ -88,7 +88,6 @@ class Log { std::ostringstream& get(); }; -extern bool gLogToConsole; // Output log messages to stdout const std::string timestr(); // A timestamp to print in messages. std::ostream& operator<<(std::ostream& os, std::ostringstream& ss);