diff options
author | VladSemenyuk <VSemenyuk@luxoft.com> | 2020-09-01 20:35:06 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-09-01 13:35:06 -0400 |
commit | 062d3b0f2a6eb2185d14dc80a885cdfe4860ce23 (patch) | |
tree | 766c4725b8b129cec2d420ff65ae7e9731e91194 /src/components/utils/include/utils | |
parent | 79fb6408810d776278bf3499c5273eb04159b076 (diff) | |
download | sdl_core-062d3b0f2a6eb2185d14dc80a885cdfe4860ce23.tar.gz |
[SDL 0046] Implement logger abstraction (#3472)
* Implement logger abstraction. Integrate it to SDL.
Create one logger instance for shared libraries
* Rename all logger macros.
* Update src/components/application_manager/rpc_plugins/rc_rpc_plugin/src/resource_allocation_manager_impl.cc
Co-authored-by: Shobhit Adlakha <ShobhitAd@users.noreply.github.com>
* Fix review comments(errors in log messages)
* Fix review coments
* Fix code style
* Add logger variable creation to new commads
* Fix review comment
* Fixe review comment(class imblemtation moved to .cc file)
Co-authored-by: Shobhit Adlakha <ShobhitAd@users.noreply.github.com>
Diffstat (limited to 'src/components/utils/include/utils')
-rw-r--r-- | src/components/utils/include/utils/logger/log4cxxlogger.h | 53 | ||||
-rw-r--r-- | src/components/utils/include/utils/logger/logger_impl.h (renamed from src/components/utils/include/utils/log_message_loop_thread.h) | 54 |
2 files changed, 87 insertions, 20 deletions
diff --git a/src/components/utils/include/utils/logger/log4cxxlogger.h b/src/components/utils/include/utils/logger/log4cxxlogger.h new file mode 100644 index 0000000000..170e6e871c --- /dev/null +++ b/src/components/utils/include/utils/logger/log4cxxlogger.h @@ -0,0 +1,53 @@ +/* + * Copyright (c) 2020, Ford Motor Company + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following + * disclaimer in the documentation and/or other materials provided with the + * distribution. + * + * Neither the name of the Ford Motor Company nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" + * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE + * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +#pragma once + +#include <log4cxx/logger.h> +#include "utils/ilogger.h" + +namespace logger { + +class Log4CXXLogger : public ThirdPartyLoggerInterface { + public: + Log4CXXLogger(const std::string& filename); + void Init() override; + void DeInit() override; + bool IsEnabledFor(const std::string& component, + LogLevel log_level) const override; + void PushLog(const LogMessage& log_message) override; + + private: + std::string filename_; +}; + +} // namespace logger diff --git a/src/components/utils/include/utils/log_message_loop_thread.h b/src/components/utils/include/utils/logger/logger_impl.h index b0cac75c71..5f32b45664 100644 --- a/src/components/utils/include/utils/log_message_loop_thread.h +++ b/src/components/utils/include/utils/logger/logger_impl.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Ford Motor Company + * Copyright (c) 2020, Ford Motor Company * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -30,43 +30,57 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#ifndef SRC_COMPONENTS_UTILS_INCLUDE_UTILS_LOG_MESSAGE_LOOP_THREAD_H_ -#define SRC_COMPONENTS_UTILS_INCLUDE_UTILS_LOG_MESSAGE_LOOP_THREAD_H_ +#ifndef SRC_COMPONENTS_UTILS_INCLUDE_UTILS_LOGGER_LOGGER_IMPL_H_ +#define SRC_COMPONENTS_UTILS_INCLUDE_UTILS_LOGGER_LOGGER_IMPL_H_ -#include <log4cxx/logger.h> -#include <queue> -#include <string> +#include "utils/ilogger.h" -#include "utils/macro.h" +#include <functional> + +#include "utils/logger_status.h" #include "utils/threads/message_loop_thread.h" namespace logger { -typedef struct { - log4cxx::LoggerPtr logger; - log4cxx::LevelPtr level; - std::string entry; - log4cxx_time_t timeStamp; - log4cxx::spi::LocationInfo location; - log4cxx::LogString threadName; -} LogMessage; - typedef std::queue<LogMessage> LogMessageQueue; typedef threads::MessageLoopThread<LogMessageQueue> LogMessageLoopThreadTemplate; +template <typename T> +using LoopThreadPtr = std::unique_ptr<T, std::function<void(T*)> >; + class LogMessageLoopThread : public LogMessageLoopThreadTemplate, public LogMessageLoopThreadTemplate::Handler { public: - LogMessageLoopThread(); + LogMessageLoopThread(std::function<void(LogMessage)> handler); + + void Push(const LogMessage& message); + + void Handle(const LogMessage message); + ~LogMessageLoopThread(); - void Handle(const LogMessage message) OVERRIDE; private: - DISALLOW_COPY_AND_ASSIGN(LogMessageLoopThread); + std::function<void(LogMessage)> force_log_; +}; + +class LoggerImpl : public Logger, public LoggerInitializer { + public: + LoggerImpl(bool use_message_loop_thread = true); + void Init(std::unique_ptr<ThirdPartyLoggerInterface>&& impl) override; + void DeInit() override; + void Flush() override; + + bool IsEnabledFor(const std::string& component, + LogLevel log_level) const override; + void PushLog(const LogMessage& log_message) override; + + std::unique_ptr<ThirdPartyLoggerInterface> impl_; + LoopThreadPtr<LogMessageLoopThread> loop_thread_; + bool use_message_loop_thread_; }; } // namespace logger -#endif // SRC_COMPONENTS_UTILS_INCLUDE_UTILS_LOG_MESSAGE_LOOP_THREAD_H_ +#endif // SRC_COMPONENTS_UTILS_INCLUDE_UTILS_LOGGER_LOGGER_IMPL_H_ |