configured logger

This commit is contained in:
Neeflix
2018-07-16 22:44:09 +02:00
parent 7cb8ff24c9
commit c37b1183ab
9 changed files with 35 additions and 18 deletions

View File

@@ -16,6 +16,7 @@
// //
#include "easylogging++.h" #include "easylogging++.h"
#define ELPP_NO_DEFAULT_LOG_FILE
#if defined(AUTO_INITIALIZE_EASYLOGGINGPP) #if defined(AUTO_INITIALIZE_EASYLOGGINGPP)
INITIALIZE_EASYLOGGINGPP INITIALIZE_EASYLOGGINGPP

View File

@@ -45,7 +45,7 @@ void Detector::detect()
} }
catch(std::out_of_range& e) 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";
} }
} }
} }

View File

@@ -72,7 +72,7 @@ std::map<char, Event> InputDriverFactory::create_input_events(json matrix_config
void InputDriverFactory::ConfigureLogger() void InputDriverFactory::ConfigureLogger()
{ {
LoggerFactory::CreateInputLogger(); LoggerFactory::CreateInputTestLogger();
} }

View File

@@ -13,17 +13,31 @@
class LoggerFactory class LoggerFactory
{ {
public: 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() static void CreateInputLogger()
{ {
el::Loggers::getLogger(INPUT_LOGGER); el::Loggers::getLogger(INPUT_LOGGER);
//TODO may configure? el::Configurations conf;
el::Configurations conf; conf.setToDefault();
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::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);
} }
}; };

View File

@@ -8,7 +8,9 @@
#include "easylogging++.h" #include "easylogging++.h"
#define INPUT_LOGGER "driver_logger" #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 #define HIGH_VERBOSITY 10

View File

@@ -30,7 +30,7 @@ SCENARIO("Creating a Detector object", "")
{ {
GIVEN("An IEventNofifier, IInputGPIOInterface") GIVEN("An IEventNofifier, IInputGPIOInterface")
{ {
LoggerFactory::CreateInputLogger(); LoggerFactory::CreateInputTestLogger();
Mock<IEventNotifier> event_notifier_mock; Mock<IEventNotifier> event_notifier_mock;
Mock<IInputGPIOInterface> gpio_interface_mock; Mock<IInputGPIOInterface> gpio_interface_mock;
@@ -58,7 +58,7 @@ SCENARIO("There are events at the input", "")
{ {
GIVEN("An IEventNofifier, three Events and an IInputGPIOInterface") GIVEN("An IEventNofifier, three Events and an IInputGPIOInterface")
{ {
LoggerFactory::CreateInputLogger(); LoggerFactory::CreateInputTestLogger();
Mock<IEventNotifier> event_notifier_mock; Mock<IEventNotifier> event_notifier_mock;
Mock<IInputGPIOInterface> gpio_interface_mock; Mock<IInputGPIOInterface> 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") GIVEN("An IEventNofifier, three Events and an IInputGPIOInterface")
{ {
LoggerFactory::CreateInputLogger(); LoggerFactory::CreateInputTestLogger();
Mock<IEventNotifier> event_notifier_mock; Mock<IEventNotifier> event_notifier_mock;
Mock<IInputGPIOInterface> gpio_interface_mock; Mock<IInputGPIOInterface> gpio_interface_mock;

View File

@@ -23,7 +23,7 @@ SCENARIO("An EventHandler gets created", "[construction}")
{ {
GIVEN("An IInputDriver") GIVEN("An IInputDriver")
{ {
LoggerFactory::CreateInputLogger(); LoggerFactory::CreateInputTestLogger();
Mock<Input::IInputDriver> input_driver_mock; Mock<Input::IInputDriver> input_driver_mock;
Fake(Dtor(input_driver_mock)); Fake(Dtor(input_driver_mock));

View File

@@ -25,7 +25,7 @@ using namespace fakeit;
SCENARIO("An EventNotifier gets created", "[construction]") SCENARIO("An EventNotifier gets created", "[construction]")
{ {
LoggerFactory::CreateInputLogger(); LoggerFactory::CreateInputTestLogger();
WHEN("The EventNotifier gets created") WHEN("The EventNotifier gets created")
{ {
@@ -52,7 +52,7 @@ SCENARIO("An EventHandler gets [un]registered at the notifier", "[un-register no
{ {
GIVEN("An EventHandler") GIVEN("An EventHandler")
{ {
LoggerFactory::CreateInputLogger(); LoggerFactory::CreateInputTestLogger();
Event event(0, 0, "test"); Event event(0, 0, "test");

View File

@@ -25,7 +25,7 @@ SCENARIO("An InputDriver gets created", "[construction}")
{ {
GIVEN("An EventNotifier and a Detector") GIVEN("An EventNotifier and a Detector")
{ {
LoggerFactory::CreateInputLogger(); LoggerFactory::CreateInputTestLogger();
Mock<IDetector> detector_mock; Mock<IDetector> detector_mock;
Fake(Dtor(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") GIVEN("An InputDriver, EventHandler and an EventNotifier")
{ {
LoggerFactory::CreateInputLogger(); LoggerFactory::CreateInputTestLogger();
Mock<Input::IDetector> detector_mock; Mock<Input::IDetector> detector_mock;
Fake(Dtor(detector_mock)); Fake(Dtor(detector_mock));