From 322aeccbe9065863246078da3a945e8f9983d2c5 Mon Sep 17 00:00:00 2001 From: Paul Nettle Date: Fri, 1 Sep 2017 13:23:34 -0500 Subject: Cleaned up the logging a bit, improved server termination status returned from ggkWait. --- src/Logger.cpp | 68 +++++++++++++++++++++++++++++++--------------------------- 1 file changed, 36 insertions(+), 32 deletions(-) (limited to 'src/Logger.cpp') diff --git a/src/Logger.cpp b/src/Logger.cpp index 7607ac8..b61daa3 100644 --- a/src/Logger.cpp +++ b/src/Logger.cpp @@ -59,6 +59,8 @@ #include "Logger.h" +namespace ggk { + // // Log receiver delegates // @@ -93,108 +95,110 @@ GGKLogReceiver Logger::logReceiverTrace = nullptr; // Register logging receiver for DEBUG logging. To register a logging level, simply call with a delegate that performs the // appropriate logging action. To unregister, call with `nullptr` -void Logger::registerDebugReceiver(GGKLogReceiver receiver) { logReceiverDebug = receiver; } +void Logger::registerDebugReceiver(GGKLogReceiver receiver) { Logger::logReceiverDebug = receiver; } // Register logging receiver for INFO logging. To register a logging level, simply call with a delegate that performs the // appropriate logging action. To unregister, call with `nullptr` -void Logger::registerInfoReceiver(GGKLogReceiver receiver) { logReceiverInfo = receiver; } +void Logger::registerInfoReceiver(GGKLogReceiver receiver) { Logger::logReceiverInfo = receiver; } // Register logging receiver for STATUS logging. To register a logging level, simply call with a delegate that performs the // appropriate logging action. To unregister, call with `nullptr` -void Logger::registerStatusReceiver(GGKLogReceiver receiver) { logReceiverStatus = receiver; } +void Logger::registerStatusReceiver(GGKLogReceiver receiver) { Logger::logReceiverStatus = receiver; } // Register logging receiver for WARN logging. To register a logging level, simply call with a delegate that performs the // appropriate logging action. To unregister, call with `nullptr` -void Logger::registerWarnReceiver(GGKLogReceiver receiver) { logReceiverWarn = receiver; } +void Logger::registerWarnReceiver(GGKLogReceiver receiver) { Logger::logReceiverWarn = receiver; } // Register logging receiver for ERROR logging. To register a logging level, simply call with a delegate that performs the // appropriate logging action. To unregister, call with `nullptr` -void Logger::registerErrorReceiver(GGKLogReceiver receiver) { logReceiverError = receiver; } +void Logger::registerErrorReceiver(GGKLogReceiver receiver) { Logger::logReceiverError = receiver; } // Register logging receiver for FATAL logging. To register a logging level, simply call with a delegate that performs the // appropriate logging action. To unregister, call with `nullptr` -void Logger::registerFatalReceiver(GGKLogReceiver receiver) { logReceiverFatal = receiver; } +void Logger::registerFatalReceiver(GGKLogReceiver receiver) { Logger::logReceiverFatal = receiver; } // Register logging receiver for ALWAYS logging. To register a logging level, simply call with a delegate that performs the // appropriate logging action. To unregister, call with `nullptr` -void Logger::registerAlwaysReceiver(GGKLogReceiver receiver) { logReceiverAlways = receiver; } +void Logger::registerAlwaysReceiver(GGKLogReceiver receiver) { Logger::logReceiverAlways = receiver; } // Register logging receiver for TRACE logging. To register a logging level, simply call with a delegate that performs the // appropriate logging action. To unregister, call with `nullptr` -void Logger::registerTraceReceiver(GGKLogReceiver receiver) { logReceiverTrace = receiver; } +void Logger::registerTraceReceiver(GGKLogReceiver receiver) { Logger::logReceiverTrace = receiver; } // // Logging actions // // Log a DEBUG entry with a C string -void Logger::debug(const char *pText) { if (nullptr != logReceiverDebug) { logReceiverDebug(pText); } } +void Logger::debug(const char *pText) { if (nullptr != Logger::logReceiverDebug) { Logger::logReceiverDebug(pText); } } // Log a DEBUG entry with a string -void Logger::debug(const std::string &text) { if (nullptr != logReceiverDebug) { debug(text.c_str()); } } +void Logger::debug(const std::string &text) { if (nullptr != Logger::logReceiverDebug) { debug(text.c_str()); } } // Log a DEBUG entry using a stream -void Logger::debug(const std::ostream &text) { if (nullptr != logReceiverDebug) { debug(static_cast(text).str().c_str()); } } +void Logger::debug(const std::ostream &text) { if (nullptr != Logger::logReceiverDebug) { debug(static_cast(text).str().c_str()); } } // Log a INFO entry with a C string -void Logger::info(const char *pText) { if (nullptr != logReceiverInfo) { logReceiverInfo(pText); } } +void Logger::info(const char *pText) { if (nullptr != Logger::logReceiverInfo) { Logger::logReceiverInfo(pText); } } // Log a INFO entry with a string -void Logger::info(const std::string &text) { if (nullptr != logReceiverInfo) { info(text.c_str()); } } +void Logger::info(const std::string &text) { if (nullptr != Logger::logReceiverInfo) { info(text.c_str()); } } // Log a INFO entry using a stream -void Logger::info(const std::ostream &text) { if (nullptr != logReceiverInfo) { info(static_cast(text).str().c_str()); } } +void Logger::info(const std::ostream &text) { if (nullptr != Logger::logReceiverInfo) { info(static_cast(text).str().c_str()); } } // Log a STATUS entry with a C string -void Logger::status(const char *pText) { if (nullptr != logReceiverStatus) { logReceiverStatus(pText); } } +void Logger::status(const char *pText) { if (nullptr != Logger::logReceiverStatus) { Logger::logReceiverStatus(pText); } } // Log a STATUS entry with a string -void Logger::status(const std::string &text) { if (nullptr != logReceiverStatus) { status(text.c_str()); } } +void Logger::status(const std::string &text) { if (nullptr != Logger::logReceiverStatus) { status(text.c_str()); } } // Log a STATUS entry using a stream -void Logger::status(const std::ostream &text) { if (nullptr != logReceiverStatus) { status(static_cast(text).str().c_str()); } } +void Logger::status(const std::ostream &text) { if (nullptr != Logger::logReceiverStatus) { status(static_cast(text).str().c_str()); } } // Log a WARN entry with a C string -void Logger::warn(const char *pText) { if (nullptr != logReceiverWarn) { logReceiverWarn(pText); } } +void Logger::warn(const char *pText) { if (nullptr != Logger::logReceiverWarn) { Logger::logReceiverWarn(pText); } } // Log a WARN entry with a string -void Logger::warn(const std::string &text) { if (nullptr != logReceiverWarn) { warn(text.c_str()); } } +void Logger::warn(const std::string &text) { if (nullptr != Logger::logReceiverWarn) { warn(text.c_str()); } } // Log a WARN entry using a stream -void Logger::warn(const std::ostream &text) { if (nullptr != logReceiverWarn) { warn(static_cast(text).str().c_str()); } } +void Logger::warn(const std::ostream &text) { if (nullptr != Logger::logReceiverWarn) { warn(static_cast(text).str().c_str()); } } // Log a ERROR entry with a C string -void Logger::error(const char *pText) { if (nullptr != logReceiverError) { logReceiverError(pText); } } +void Logger::error(const char *pText) { if (nullptr != Logger::logReceiverError) { Logger::logReceiverError(pText); } } // Log a ERROR entry with a string -void Logger::error(const std::string &text) { if (nullptr != logReceiverError) { error(text.c_str()); } } +void Logger::error(const std::string &text) { if (nullptr != Logger::logReceiverError) { error(text.c_str()); } } // Log a ERROR entry using a stream -void Logger::error(const std::ostream &text) { if (nullptr != logReceiverError) { error(static_cast(text).str().c_str()); } } +void Logger::error(const std::ostream &text) { if (nullptr != Logger::logReceiverError) { error(static_cast(text).str().c_str()); } } // Log a FATAL entry with a C string -void Logger::fatal(const char *pText) { if (nullptr != logReceiverFatal) { logReceiverFatal(pText); } } +void Logger::fatal(const char *pText) { if (nullptr != Logger::logReceiverFatal) { Logger::logReceiverFatal(pText); } } // Log a FATAL entry with a string -void Logger::fatal(const std::string &text) { if (nullptr != logReceiverFatal) { fatal(text.c_str()); } } +void Logger::fatal(const std::string &text) { if (nullptr != Logger::logReceiverFatal) { fatal(text.c_str()); } } // Log a FATAL entry using a stream -void Logger::fatal(const std::ostream &text) { if (nullptr != logReceiverFatal) { fatal(static_cast(text).str().c_str()); } } +void Logger::fatal(const std::ostream &text) { if (nullptr != Logger::logReceiverFatal) { fatal(static_cast(text).str().c_str()); } } // Log a ALWAYS entry with a C string -void Logger::always(const char *pText) { if (nullptr != logReceiverAlways) { logReceiverAlways(pText); } } +void Logger::always(const char *pText) { if (nullptr != Logger::logReceiverAlways) { Logger::logReceiverAlways(pText); } } // Log a ALWAYS entry with a string -void Logger::always(const std::string &text) { if (nullptr != logReceiverAlways) { always(text.c_str()); } } +void Logger::always(const std::string &text) { if (nullptr != Logger::logReceiverAlways) { always(text.c_str()); } } // Log a ALWAYS entry using a stream -void Logger::always(const std::ostream &text) { if (nullptr != logReceiverAlways) { always(static_cast(text).str().c_str()); } } +void Logger::always(const std::ostream &text) { if (nullptr != Logger::logReceiverAlways) { always(static_cast(text).str().c_str()); } } // Log a TRACE entry with a C string -void Logger::trace(const char *pText) { if (nullptr != logReceiverTrace) { logReceiverTrace(pText); } } +void Logger::trace(const char *pText) { if (nullptr != Logger::logReceiverTrace) { Logger::logReceiverTrace(pText); } } // Log a TRACE entry with a string -void Logger::trace(const std::string &text) { if (nullptr != logReceiverTrace) { trace(text.c_str()); } } +void Logger::trace(const std::string &text) { if (nullptr != Logger::logReceiverTrace) { trace(text.c_str()); } } // Log a TRACE entry using a stream -void Logger::trace(const std::ostream &text) { if (nullptr != logReceiverTrace) { trace(static_cast(text).str().c_str()); } } +void Logger::trace(const std::ostream &text) { if (nullptr != Logger::logReceiverTrace) { trace(static_cast(text).str().c_str()); } } + +}; // namespace ggk \ No newline at end of file -- cgit v1.2.3