From 0c7f26772a307d24c0037faa5bda84c3a8252a66 Mon Sep 17 00:00:00 2001 From: Neeflix Date: Mon, 16 Jul 2018 22:47:00 +0200 Subject: [PATCH] refactored loggerfactory --- FlippR-Driver/src/input/InputDriverFactory.cpp | 12 +----------- FlippR-Driver/src/utilities/LoggerFactory.hpp | 3 +-- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/FlippR-Driver/src/input/InputDriverFactory.cpp b/FlippR-Driver/src/input/InputDriverFactory.cpp index 55dafae..8fd8d1b 100644 --- a/FlippR-Driver/src/input/InputDriverFactory.cpp +++ b/FlippR-Driver/src/input/InputDriverFactory.cpp @@ -7,9 +7,7 @@ #include "InputDriverFactory.h" - #include "utilities/LoggerFactory.hpp" - #include "EventNotifier.h" using namespace nlohmann; @@ -20,14 +18,11 @@ namespace Input std::shared_ptr InputDriverFactory::get_InputDriver(std::istream& input_config_stream, std::istream& matrix_config_stream) { - ConfigureLogger(); + LoggerFactory::CreateInputLogger(); IBlockingQueue* event_queue = new BlockingQueue; - std::shared_ptr event_notifier = std::make_shared(event_queue); - std::unique_ptr input_gpio_interface = std::make_unique(input_config_stream); - std::unique_ptr detector(std::move(get_detector(matrix_config_stream, std::move(input_gpio_interface), event_notifier))); return std::shared_ptr(new InputDriver(event_notifier, std::move(detector))); @@ -70,10 +65,5 @@ std::map InputDriverFactory::create_input_events(json matrix_config return events; } -void InputDriverFactory::ConfigureLogger() -{ - LoggerFactory::CreateInputTestLogger(); -} - } diff --git a/FlippR-Driver/src/utilities/LoggerFactory.hpp b/FlippR-Driver/src/utilities/LoggerFactory.hpp index d978a4a..adaf1a5 100644 --- a/FlippR-Driver/src/utilities/LoggerFactory.hpp +++ b/FlippR-Driver/src/utilities/LoggerFactory.hpp @@ -10,9 +10,8 @@ #include "config.h" -class LoggerFactory +namespace LoggerFactory { -public: static void CreateInputTestLogger() { el::Loggers::getLogger(INPUT_LOGGER);