From c37b1183abf0a1a5ff8ddc71ddbc0882594d868b Mon Sep 17 00:00:00 2001 From: Neeflix Date: Mon, 16 Jul 2018 22:44:09 +0200 Subject: [PATCH] configured logger --- .../lib/easylogging/easylogging++.cc | 1 + FlippR-Driver/src/input/Detector.cpp | 2 +- .../src/input/InputDriverFactory.cpp | 2 +- FlippR-Driver/src/utilities/LoggerFactory.hpp | 28 ++++++++++++++----- FlippR-Driver/src/utilities/config.h | 4 ++- FlippR-Driver/tests/input/TestDetector.cpp | 6 ++-- .../tests/input/TestEventHandler.cpp | 2 +- .../tests/input/TestEventNotifier.cpp | 4 +-- FlippR-Driver/tests/input/TestInputDriver.cpp | 4 +-- 9 files changed, 35 insertions(+), 18 deletions(-) diff --git a/FlippR-Driver/lib/easylogging/easylogging++.cc b/FlippR-Driver/lib/easylogging/easylogging++.cc index a87f0b8..278531a 100644 --- a/FlippR-Driver/lib/easylogging/easylogging++.cc +++ b/FlippR-Driver/lib/easylogging/easylogging++.cc @@ -16,6 +16,7 @@ // #include "easylogging++.h" +#define ELPP_NO_DEFAULT_LOG_FILE #if defined(AUTO_INITIALIZE_EASYLOGGINGPP) INITIALIZE_EASYLOGGINGPP diff --git a/FlippR-Driver/src/input/Detector.cpp b/FlippR-Driver/src/input/Detector.cpp index 8698211..746f1a9 100644 --- a/FlippR-Driver/src/input/Detector.cpp +++ b/FlippR-Driver/src/input/Detector.cpp @@ -45,7 +45,7 @@ void Detector::detect() } catch(std::out_of_range& e) { - CLOG(WARNING, INPUT_LOGGER) << "Did not found event for address: " << address << " check config-file"; + CLOG_N_TIMES(1, WARNING, INPUT_LOGGER) << "Did not found event for address: " << address << " check config-file"; } } } diff --git a/FlippR-Driver/src/input/InputDriverFactory.cpp b/FlippR-Driver/src/input/InputDriverFactory.cpp index 58d6b5b..55dafae 100644 --- a/FlippR-Driver/src/input/InputDriverFactory.cpp +++ b/FlippR-Driver/src/input/InputDriverFactory.cpp @@ -72,7 +72,7 @@ std::map InputDriverFactory::create_input_events(json matrix_config void InputDriverFactory::ConfigureLogger() { - LoggerFactory::CreateInputLogger(); + LoggerFactory::CreateInputTestLogger(); } diff --git a/FlippR-Driver/src/utilities/LoggerFactory.hpp b/FlippR-Driver/src/utilities/LoggerFactory.hpp index e77340e..d978a4a 100644 --- a/FlippR-Driver/src/utilities/LoggerFactory.hpp +++ b/FlippR-Driver/src/utilities/LoggerFactory.hpp @@ -13,17 +13,31 @@ class LoggerFactory { public: + static void CreateInputTestLogger() + { + el::Loggers::getLogger(INPUT_LOGGER); + el::Configurations conf; + + conf.setToDefault(); + + conf.set(el::Level::Global, el::ConfigurationType::ToFile, "false"); + conf.set(el::Level::Global, el::ConfigurationType::Format, "%datetime [%level] [%func] : %msg"); + + el::Loggers::reconfigureAllLoggers(conf); + } + static void CreateInputLogger() { - el::Loggers::getLogger(INPUT_LOGGER); + el::Loggers::getLogger(INPUT_LOGGER); - //TODO may configure? - el::Configurations conf; - conf.setToDefault(); - conf.set(el::Level::Global, el::ConfigurationType::Filename, DRIVER_LOG_FILE); - conf.set(el::Level::Global, el::ConfigurationType::Format, "%datetime [%level] [%func] : %msg"); + el::Configurations conf; + conf.setToDefault(); - el::Loggers::reconfigureLogger(INPUT_LOGGER, conf); + conf.set(el::Level::Global, el::ConfigurationType::ToFile, "true"); + conf.set(el::Level::Global, el::ConfigurationType::Filename, INPUT_LOGGER_FILE); + conf.set(el::Level::Global, el::ConfigurationType::Format, "%datetime [%level] [%func] : %msg"); + + el::Loggers::reconfigureLogger(INPUT_LOGGER, conf); } }; diff --git a/FlippR-Driver/src/utilities/config.h b/FlippR-Driver/src/utilities/config.h index 3ed3924..3c57158 100644 --- a/FlippR-Driver/src/utilities/config.h +++ b/FlippR-Driver/src/utilities/config.h @@ -8,7 +8,9 @@ #include "easylogging++.h" #define INPUT_LOGGER "driver_logger" -#define DRIVER_LOG_FILE "/var/log/flippr_driver.conf" +#define INPUT_LOGGER_FILE "input_driver.log" + +#define DRIVER_CONF_FILE "/var/log/flippr_driver.conf" #define HIGH_VERBOSITY 10 diff --git a/FlippR-Driver/tests/input/TestDetector.cpp b/FlippR-Driver/tests/input/TestDetector.cpp index 496c63d..f43f3e9 100644 --- a/FlippR-Driver/tests/input/TestDetector.cpp +++ b/FlippR-Driver/tests/input/TestDetector.cpp @@ -30,7 +30,7 @@ SCENARIO("Creating a Detector object", "") { GIVEN("An IEventNofifier, IInputGPIOInterface") { - LoggerFactory::CreateInputLogger(); + LoggerFactory::CreateInputTestLogger(); Mock event_notifier_mock; Mock gpio_interface_mock; @@ -58,7 +58,7 @@ SCENARIO("There are events at the input", "") { GIVEN("An IEventNofifier, three Events and an IInputGPIOInterface") { - LoggerFactory::CreateInputLogger(); + LoggerFactory::CreateInputTestLogger(); Mock event_notifier_mock; Mock gpio_interface_mock; @@ -97,7 +97,7 @@ SCENARIO("There are events at the input but no suitable event in map", "") { GIVEN("An IEventNofifier, three Events and an IInputGPIOInterface") { - LoggerFactory::CreateInputLogger(); + LoggerFactory::CreateInputTestLogger(); Mock event_notifier_mock; Mock gpio_interface_mock; diff --git a/FlippR-Driver/tests/input/TestEventHandler.cpp b/FlippR-Driver/tests/input/TestEventHandler.cpp index 48bc246..78ccbf9 100644 --- a/FlippR-Driver/tests/input/TestEventHandler.cpp +++ b/FlippR-Driver/tests/input/TestEventHandler.cpp @@ -23,7 +23,7 @@ SCENARIO("An EventHandler gets created", "[construction}") { GIVEN("An IInputDriver") { - LoggerFactory::CreateInputLogger(); + LoggerFactory::CreateInputTestLogger(); Mock input_driver_mock; Fake(Dtor(input_driver_mock)); diff --git a/FlippR-Driver/tests/input/TestEventNotifier.cpp b/FlippR-Driver/tests/input/TestEventNotifier.cpp index e7fb30c..9551463 100644 --- a/FlippR-Driver/tests/input/TestEventNotifier.cpp +++ b/FlippR-Driver/tests/input/TestEventNotifier.cpp @@ -25,7 +25,7 @@ using namespace fakeit; SCENARIO("An EventNotifier gets created", "[construction]") { - LoggerFactory::CreateInputLogger(); + LoggerFactory::CreateInputTestLogger(); WHEN("The EventNotifier gets created") { @@ -52,7 +52,7 @@ SCENARIO("An EventHandler gets [un]registered at the notifier", "[un-register no { GIVEN("An EventHandler") { - LoggerFactory::CreateInputLogger(); + LoggerFactory::CreateInputTestLogger(); Event event(0, 0, "test"); diff --git a/FlippR-Driver/tests/input/TestInputDriver.cpp b/FlippR-Driver/tests/input/TestInputDriver.cpp index eb671d8..4d51482 100644 --- a/FlippR-Driver/tests/input/TestInputDriver.cpp +++ b/FlippR-Driver/tests/input/TestInputDriver.cpp @@ -25,7 +25,7 @@ SCENARIO("An InputDriver gets created", "[construction}") { GIVEN("An EventNotifier and a Detector") { - LoggerFactory::CreateInputLogger(); + LoggerFactory::CreateInputTestLogger(); Mock detector_mock; Fake(Dtor(detector_mock)); @@ -52,7 +52,7 @@ SCENARIO("An EventHandler [un]registers at the driver", "[un-register]") { GIVEN("An InputDriver, EventHandler and an EventNotifier") { - LoggerFactory::CreateInputLogger(); + LoggerFactory::CreateInputTestLogger(); Mock detector_mock; Fake(Dtor(detector_mock));