Updated Logger to use enum class

This commit is contained in:
epoupon
2015-09-11 17:58:10 +02:00
parent c94c859f68
commit 9ebedd5bfc
26 changed files with 139 additions and 141 deletions
+15 -16
View File
@@ -23,16 +23,16 @@ std::string getModuleName(Module mod)
{
switch (mod)
{
case MOD_AV: return "AV";
case MOD_COVER: return "COVER";
case MOD_DB: return "DB";
case MOD_DBUPDATER: return "DB UPDATER";
case MOD_MAIN: return "MAIN";
case MOD_METADATA: return "METADATA";
case MOD_REMOTE: return "REMOTE";
case MOD_SERVICE: return "SERVICE";
case MOD_TRANSCODE: return "TRANSCODE";
case MOD_UI: return "UI";
case Module::AV: return "AV";
case Module::COVER: return "COVER";
case Module::DB: return "DB";
case Module::DBUPDATER: return "DB UPDATER";
case Module::MAIN: return "MAIN";
case Module::METADATA: return "METADATA";
case Module::REMOTE: return "REMOTE";
case Module::SERVICE: return "SERVICE";
case Module::TRANSCODE: return "TRANSCODE";
case Module::UI: return "UI";
}
return "";
}
@@ -41,12 +41,11 @@ std::string getSeverityName(Severity sev)
{
switch (sev)
{
case SEV_CRIT: return "fatal";
case SEV_ERROR: return "error";
case SEV_WARNING: return "warning";
case SEV_NOTICE:
case SEV_INFO: return "info";
case SEV_DEBUG: return "debug";
case Severity::FATAL: return "fatal";
case Severity::ERROR: return "error";
case Severity::WARNING: return "warning";
case Severity::INFO: return "info";
case Severity::DEBUG: return "debug";
}
return "";
}
+18 -19
View File
@@ -27,33 +27,32 @@
#include <string>
enum Severity
enum class Severity
{
SEV_CRIT = 2,
SEV_ERROR = 3,
SEV_WARNING = 4,
SEV_NOTICE = 5,
SEV_INFO = 6,
SEV_DEBUG = 7,
FATAL,
ERROR,
WARNING,
INFO,
DEBUG,
};
enum Module
enum class Module
{
MOD_AV,
MOD_COVER,
MOD_DB,
MOD_DBUPDATER,
MOD_MAIN,
MOD_METADATA,
MOD_REMOTE,
MOD_SERVICE,
MOD_TRANSCODE,
MOD_UI,
AV,
COVER,
DB,
DBUPDATER,
MAIN,
METADATA,
REMOTE,
SERVICE,
TRANSCODE,
UI,
};
std::string getModuleName(Module mod);
std::string getSeverityName(Severity sev);
#define LMS_LOG(module, level) Wt::log(getSeverityName(level)) << Wt::WLogger::sep << "[" << getModuleName(module) << "]" << Wt::WLogger::sep
#define LMS_LOG(module, level) Wt::log(getSeverityName(Severity::level)) << Wt::WLogger::sep << "[" << getModuleName(Module::module) << "]" << Wt::WLogger::sep
#endif