Removed custom logger(switching to WServer's logger) + removed custom config file
This commit is contained in:
epoupon
+27
-95
@@ -17,105 +17,37 @@
|
||||
* along with LMS. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#include <boost/log/core.hpp>
|
||||
#include <boost/log/trivial.hpp>
|
||||
#include <boost/log/expressions.hpp>
|
||||
#include <boost/log/sinks/text_file_backend.hpp>
|
||||
#include <boost/log/keywords/filter.hpp>
|
||||
#include <boost/log/utility/setup/file.hpp>
|
||||
#include <boost/log/utility/setup/common_attributes.hpp>
|
||||
#include <boost/log/utility/setup/console.hpp>
|
||||
#include <boost/log/sources/severity_logger.hpp>
|
||||
#include <boost/log/sources/record_ostream.hpp>
|
||||
#include <boost/log/attributes/constant.hpp>
|
||||
#include <boost/log/sources/severity_logger.hpp>
|
||||
#include <boost/log/sources/record_ostream.hpp>
|
||||
#include <boost/log/support/date_time.hpp>
|
||||
#include <boost/log/attributes/named_scope.hpp>
|
||||
|
||||
#include <boost/date_time/posix_time/ptime.hpp>
|
||||
|
||||
#include "config/ConfigReader.hpp"
|
||||
|
||||
|
||||
#include "Logger.hpp"
|
||||
|
||||
Logger&
|
||||
Logger::instance()
|
||||
std::string getModuleName(Module mod)
|
||||
{
|
||||
static Logger instance;
|
||||
return instance;
|
||||
}
|
||||
|
||||
Logger::Logger()
|
||||
{
|
||||
// Initialiaz loggers
|
||||
static const std::vector<Module> modules =
|
||||
switch (mod)
|
||||
{
|
||||
MOD_AV,
|
||||
MOD_COVER,
|
||||
MOD_DB,
|
||||
MOD_DBUPDATER,
|
||||
MOD_MAIN,
|
||||
MOD_METADATA,
|
||||
MOD_REMOTE,
|
||||
MOD_SERVICE,
|
||||
MOD_TRANSCODE,
|
||||
MOD_UI,
|
||||
};
|
||||
|
||||
for(Module module : modules)
|
||||
_loggers[module].add_attribute("Module", boost::log::attributes::constant< Module >(module));
|
||||
}
|
||||
|
||||
boost::log::sources::severity_logger< Severity >&
|
||||
Logger::get(Module module)
|
||||
{
|
||||
return _loggers[module];
|
||||
}
|
||||
|
||||
void
|
||||
Logger::init()
|
||||
{
|
||||
boost::log::add_common_attributes();
|
||||
|
||||
boost::log::register_simple_formatter_factory< Severity, char >("Severity");
|
||||
|
||||
if (ConfigReader::instance().getBool("main.logger.console.enable", false))
|
||||
{
|
||||
boost::log::add_console_log(std::cout,
|
||||
boost::log::keywords::format = (
|
||||
boost::log::expressions::stream
|
||||
<< boost::log::expressions::format_date_time< boost::posix_time::ptime >("TimeStamp", "[%Y-%m-%d %H:%M:%S]")
|
||||
<< " [" << boost::log::expressions::attr< Module >("Module") << "]"
|
||||
<< " [" << boost::log::expressions::attr< Severity >("Severity") << "]"
|
||||
<< " " << boost::log::expressions::smessage
|
||||
)
|
||||
);
|
||||
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";
|
||||
}
|
||||
|
||||
if (ConfigReader::instance().getBool("main.logger.file.enable", false))
|
||||
{
|
||||
boost::log::add_file_log
|
||||
(
|
||||
boost::log::keywords::file_name = ConfigReader::instance().getString("main.logger.file.path") + std::string(".%N"),
|
||||
boost::log::keywords::rotation_size = 10 * 1024 * 1024,
|
||||
boost::log::keywords::open_mode = std::ios_base::app,
|
||||
boost::log::keywords::auto_flush = true,
|
||||
boost::log::keywords::format = (
|
||||
boost::log::expressions::stream
|
||||
<< boost::log::expressions::format_date_time< boost::posix_time::ptime >("TimeStamp", "[%Y-%m-%d %H:%M:%S]")
|
||||
<< " [" << boost::log::expressions::attr< Module >("Module") << "]"
|
||||
<< " [" << boost::log::expressions::attr< Severity >("Severity") << "]"
|
||||
<< " " << boost::log::expressions::smessage
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
boost::log::core::get()->set_filter
|
||||
(
|
||||
boost::log::expressions::attr<Severity>("Severity") <= ConfigReader::instance().getULong("main.logger.level", SEV_DEBUG)
|
||||
);
|
||||
|
||||
return "";
|
||||
}
|
||||
|
||||
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";
|
||||
}
|
||||
return "";
|
||||
}
|
||||
|
||||
|
||||
+8
-81
@@ -20,15 +20,11 @@
|
||||
#ifndef LOGGER_HPP__
|
||||
#define LOGGER_HPP__
|
||||
|
||||
#include <map>
|
||||
#include <Wt/WServer>
|
||||
#include <Wt/WLogger>
|
||||
|
||||
#include <boost/log/expressions/keyword_fwd.hpp>
|
||||
#include <boost/log/expressions/keyword.hpp>
|
||||
#include <string>
|
||||
|
||||
#include <boost/log/trivial.hpp>
|
||||
#include <boost/log/attributes/named_scope.hpp>
|
||||
|
||||
#define LMS_LOG(module, level) BOOST_LOG_SEV(Logger::instance().get(module), level)
|
||||
|
||||
enum Severity
|
||||
{
|
||||
@@ -42,7 +38,7 @@ enum Severity
|
||||
|
||||
enum Module
|
||||
{
|
||||
MOD_AV = 0,
|
||||
MOD_AV,
|
||||
MOD_COVER,
|
||||
MOD_DB,
|
||||
MOD_DBUPDATER,
|
||||
@@ -54,78 +50,9 @@ enum Module
|
||||
MOD_UI,
|
||||
};
|
||||
|
||||
BOOST_LOG_ATTRIBUTE_KEYWORD(module, "Module", Module)
|
||||
std::string getModuleName(Module mod);
|
||||
std::string getSeverityName(Severity sev);
|
||||
|
||||
class Logger
|
||||
{
|
||||
public:
|
||||
|
||||
Logger(const Logger&) = delete;
|
||||
Logger& operator=(const Logger&) = delete;
|
||||
|
||||
static Logger& instance();
|
||||
|
||||
void init();
|
||||
|
||||
boost::log::sources::severity_logger< Severity >&
|
||||
get(Module module);
|
||||
|
||||
private:
|
||||
Logger();
|
||||
|
||||
std::map<Module, boost::log::sources::severity_logger< Severity > > _loggers;
|
||||
};
|
||||
|
||||
// The formatting logic for the severity level
|
||||
template< typename CharT, typename TraitsT >
|
||||
inline std::basic_ostream< CharT, TraitsT >& operator<< (
|
||||
std::basic_ostream< CharT, TraitsT >& strm, Severity lvl)
|
||||
{
|
||||
static const char* const str[] =
|
||||
{
|
||||
"",
|
||||
"",
|
||||
"CRIT",
|
||||
"ERROR",
|
||||
"WARNING",
|
||||
"NOTICE",
|
||||
"INFO",
|
||||
"DEBUG"
|
||||
};
|
||||
if (static_cast< std::size_t >(lvl) < (sizeof(str) / sizeof(*str)))
|
||||
strm << str[lvl];
|
||||
else
|
||||
strm << static_cast< int >(lvl);
|
||||
return strm;
|
||||
}
|
||||
|
||||
template< typename CharT, typename TraitsT >
|
||||
inline std::basic_ostream< CharT, TraitsT >& operator<< (
|
||||
std::basic_ostream< CharT, TraitsT >& strm, Module val)
|
||||
{
|
||||
const char* res = NULL;
|
||||
|
||||
switch(val)
|
||||
{
|
||||
case MOD_AV: res = "AV"; break;
|
||||
case MOD_COVER: res = "COVER"; break;
|
||||
case MOD_DB: res = "DB"; break;
|
||||
case MOD_DBUPDATER: res = "DBUPDATER"; break;
|
||||
case MOD_MAIN: res = "MAIN"; break;
|
||||
case MOD_METADATA: res = "METADATA"; break;
|
||||
case MOD_REMOTE: res = "REMOTE"; break;
|
||||
case MOD_SERVICE: res = "SERVICE"; break;
|
||||
case MOD_TRANSCODE: res = "TRANSCODE"; break;
|
||||
case MOD_UI: res = "UI"; break;
|
||||
}
|
||||
|
||||
if (res)
|
||||
strm << res;
|
||||
else
|
||||
strm << static_cast< int >(val);
|
||||
return strm;
|
||||
}
|
||||
|
||||
|
||||
#endif // LOGGER_HPP__
|
||||
#define LMS_LOG(module, level) Wt::WServer::instance()->log(getSeverityName(level)) << Wt::WLogger::sep << "[" << getModuleName(module) << "]" << Wt::WLogger::sep
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user