WIP.Logger: Added severity level config. Added module tag

config/ConfigReader.cpp

@@ -10,6 +10,7 @@ ConfigReader::getLoggerConfig(Logger::Config& config)
 {
 	config.enableFileLogging = _config.lookupValue("main.logger.file", config.logPath);
 	config.enableConsoleLogging = _config.lookup("main.logger.console");
+	config.minSeverity = static_cast<Severity>((int)_config.lookup("main.logger.level"));
 }
 
 void

etc/lms.conf.sample

@@ -4,6 +4,7 @@ main = {
 	logger = {
 		file = "/var/lms/lms.log"	# comment to disable file logging
 		console = true;
+		level = 7;
 	}
 
 	db = "/var/lms/lms.db";

logger/Logger.cpp

@@ -0,0 +1,91 @@
+#include <boost/foreach.hpp>
+
+#include <boost/log/core.hpp>
+#include <boost/log/trivial.hpp>
+#include <boost/log/expressions.hpp>
+#include <boost/log/sinks/text_file_backend.hpp>
+#include </usr/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/date_time/posix_time/ptime.hpp>
+
+
+#include "Logger.hpp"
+
+Logger&
+Logger::instance()
+{
+	static Logger instance;
+	return instance;
+}
+
+Logger::Logger()
+{
+	// Initialiaz loggers
+	static const struct LoggerDef {
+		Module	module;
+		std::string	name;
+	} loggers[] = {
+		{MOD_MAIN,	"MAIN"},
+		{MOD_UI,	"UI"},
+		{MOD_REMOTE,	"REMOTE"}
+	};
+
+	BOOST_FOREACH(const struct LoggerDef& logger, loggers) {
+		std::cout << "Adding attribute" << std::endl;
+	    _loggers[logger.module].add_attribute("Module", boost::log::attributes::constant< Module >(logger.module));
+	}
+}
+
+void
+Logger::init(const Config& config)
+{
+	boost::log::add_common_attributes();
+
+	boost::log::register_simple_formatter_factory< Severity, char >("Severity");
+
+	if (config.enableFileLogging)
+	{
+		boost::log::add_file_log
+			(
+			 boost::log::keywords::file_name = config.logPath + std::string(".%N"),
+			 boost::log::keywords::rotation_size = 10 * 1024 * 1024,
+			 boost::log::keywords::open_mode = std::ios_base::app,
+			 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
+				 )
+			);
+	}
+
+	if (config.enableConsoleLogging)
+	{
+		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
+					)
+				);
+	}
+
+	boost::log::core::get()->set_filter
+		(
+		 boost::log::expressions::attr<Severity>("Severity") <= config.minSeverity
+		);
+
+}
+

logger/Logger.hpp

@@ -0,0 +1,101 @@
+#ifndef LOGGER_HPP__
+#define LOGGER_HPP__
+
+#include <map>
+
+#include <boost/log/expressions/keyword_fwd.hpp>
+#include <boost/log/expressions/keyword.hpp>
+
+#include <boost/log/trivial.hpp>
+#include <boost/log/sources/severity_logger.hpp>
+
+#define LMS_LOG(module, level)	BOOST_LOG_SEV(Logger::instance().get(module), level)
+
+enum Severity
+{
+	SEV_DEBUG	= 7,
+	SEV_INFO	= 6,
+	SEV_NOTICE	= 5,
+	SEV_WARNING	= 4,
+	SEV_ERROR	= 3,
+	SEV_CRIT	= 2,
+};
+
+enum Module
+{
+	MOD_MAIN	= 0,
+	MOD_UI,
+	MOD_REMOTE,
+};
+
+BOOST_LOG_ATTRIBUTE_KEYWORD(module, "Module", Module)
+
+class Logger
+{
+	public:
+
+		static Logger& instance();
+
+		struct Config {
+			bool		enableFileLogging;
+			bool		enableConsoleLogging;
+			std::string	logPath;
+			Severity	minSeverity;
+		};
+
+		//[ example_tutorial_file_advanced
+		void init(const Config& config);
+
+		boost::log::sources::severity_logger< Severity >&
+			get(Module module) { return _loggers[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)
+{
+	static const char* const str[] =
+	{
+		"MAIN",
+		"UI",
+		"REMOTE",
+	};
+	if (static_cast< std::size_t >(val) < (sizeof(str) / sizeof(*str)))
+		strm << str[val];
+	else
+		strm << static_cast< int >(val);
+	return strm;
+}
+
+
+#endif // LOGGER_HPP__
+

main/main.cpp

@@ -48,6 +48,7 @@ int main(int argc, char* argv[])
 			Logger::instance().init(loggerConfig);
 		}
 
+
 		Service::DatabaseUpdateService::Config dbUpdateConfig;
 		configReader.getDatabaseUpdateConfig(dbUpdateConfig);