diff --git a/src/base/logging.cc b/src/base/logging.cc index b8f20f983a..12904554ce 100644 --- a/src/base/logging.cc +++ b/src/base/logging.cc @@ -46,27 +46,18 @@ namespace { -class NormalLogger : public Logger +class ExitLogger : public Logger { public: using Logger::Logger; - protected: - void log(const Loc &loc, std::string s) override { std::cerr << s; } -}; - -class ExitLogger : public NormalLogger -{ - public: - using NormalLogger::NormalLogger; - protected: void log(const Loc &loc, std::string s) override { std::stringstream ss; ccprintf(ss, "Memory Usage: %ld KBytes\n", memUsage()); - NormalLogger::log(loc, s + ss.str()); + Logger::log(loc, s + ss.str()); } }; @@ -81,9 +72,9 @@ class FatalLogger : public ExitLogger ExitLogger panicLogger("panic: "); FatalLogger fatalLogger("fatal: "); -NormalLogger warnLogger("warn: "); -NormalLogger infoLogger("info: "); -NormalLogger hackLogger("hack: "); +Logger warnLogger("warn: "); +Logger infoLogger("info: "); +Logger hackLogger("hack: "); } // anonymous namespace diff --git a/src/base/logging.hh b/src/base/logging.hh index 87bca8e01c..4ef700ac67 100644 --- a/src/base/logging.hh +++ b/src/base/logging.hh @@ -122,7 +122,8 @@ class Logger protected: bool enabled; - virtual void log(const Loc &loc, std::string s) = 0; + /** Generates the log message. By default it is sent to cerr. */ + virtual void log(const Loc &loc, std::string s) { std::cerr << s; } virtual void exit() { /* Fall through to the abort in exit_helper. */ } const char *prefix;