Skip to content

S
spdlog
Commit f36be4d5 authored by gabime's avatar gabime
Browse files
Options

Moved lite source to folders|

parent c2b0e223
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 248 additions and 240 deletions
CMakeLists.txt
View file @ f36be4d5
This diff is collapsed.
lite/CMakeLists.txt deleted 100644 → 0
View file @ c2b0e223
cmake_minimum_required(VERSION 3.1)
project(spdlog_lite)
add_library(spdlog_lite spdlite.cpp spdlite.h spdlite_global.cpp spdlite_global.h spdlite_macros.h)
target_link_libraries(spdlog_lite spdlog::spdlog)
spdlite/CMakeLists.txt 0 → 100644
View file @ f36be4d5
cmake_minimum_required(VERSION 3.1)
project(spdlite)
include_directories(${PROJECT_SOURCE_DIR}/include)
file(GLOB SRC_FILES ${PROJECT_SOURCE_DIR}/src/*.cpp)
file(GLOB HEADER_FILES ${PROJECT_SOURCE_DIR}/include/*.h)
add_library(spdlite ${SRC_FILES} ${HEADER_FILES})
target_link_libraries(spdlite spdlog::spdlog)
add_subdirectory(example)
lite-example/CMakeLists.txt → spdlite/example/CMakeLists.txt
View file @ f36be4d5
project(spdlog-lite-example CXX) project(spdlite-example CXX)
find_package(Threads REQUIRED)
set(LITE_SOURCES example.cpp create_logger.cpp) set(LITE_SOURCES example.cpp create_logger.cpp)
add_executable(${PROJECT_NAME} ${LITE_SOURCES}) add_executable(${PROJECT_NAME} ${LITE_SOURCES})
include_directories(../lite) find_package(Threads)
target_link_libraries(${PROJECT_NAME} PRIVATE Threads::Threads) target_link_libraries(${PROJECT_NAME} PRIVATE Threads::Threads)
target_link_libraries(${PROJECT_NAME} PRIVATE spdlog_lite) target_link_libraries(${PROJECT_NAME} PRIVATE spdlite)
lite-example/create_logger.cpp → spdlite/example/create_logger.cpp
View file @ f36be4d5
// Copyright(c) 2015-present Gabi Melman. // Copyright(c) 2015-present Gabi Melman.
// Distributed under the MIT License (http://opensource.org/licenses/MIT) // Distributed under the MIT License (http://opensource.org/licenses/MIT)
#include "spdlite.h" #include "spdlite/spdlite.h"
#include "spdlog/spdlog.h" #include "spdlog/spdlog.h"
#include "spdlog/sinks/basic_file_sink.h" #include "spdlog/sinks/basic_file_sink.h"
......
lite-example/example.cpp → spdlite/example/example.cpp
View file @ f36be4d5
// Copyright(c) 2015-present Gabi Melman. // Copyright(c) 2015-present Gabi Melman.
// Distributed under the MIT License (http://opensource.org/licenses/MIT) // Distributed under the MIT License (http://opensource.org/licenses/MIT)
#include "spdlite.h" #include "spdlite/spdlite.h"
#include "spdlite_global.h" #include "spdlite/spdlite_global.h"
#define SPDLITE_ACTIVE_LEVEL SPDLITE_LEVEL_TRACE #define SPDLITE_ACTIVE_LEVEL SPDLITE_LEVEL_TRACE
#include "spdlite_macros.h" #include "spdlite/spdlite_macros.h"
int main() int main()
{ {
SPDLITE_TRACE("SOME INFO {}", 123); SPDLITE_TRACE("SOME INFO {}", 123);
} }
\ No newline at end of file
lite/spdlite.cpp → spdlite/src/spdlite.cpp
View file @ f36be4d5
// //
// Copyright(c) 2019-present spdlog // Copyright(c) 2019-present spdlog
// Distributed under the MIT License (http://opensource.org/licenses/MIT) // Distributed under the MIT License (http://opensource.org/licenses/MIT)
// //
#include "spdlite.h" #include "spdlite/spdlite.h"
#include "spdlog/spdlog.h" #include "spdlog/spdlog.h"
static spdlog::level::level_enum to_spdlog_level(spdlite::level level) static spdlog::level::level_enum to_spdlog_level(spdlite::level level)
{ {
return static_cast<spdlog::level::level_enum>(level); return static_cast<spdlog::level::level_enum>(level);
} }
static spdlite::level to_lite_level(spdlog::level::level_enum level) static spdlite::level to_lite_level(spdlog::level::level_enum level)
{ {
return static_cast<spdlite::level>(level); return static_cast<spdlite::level>(level);
} }
spdlite::logger::logger(std::shared_ptr<spdlog::logger> impl) spdlite::logger::logger(std::shared_ptr<spdlog::logger> impl)
{ {
impl_ = std::move(impl); impl_ = std::move(impl);
} }
void spdlite::logger::set_impl(std::shared_ptr<spdlog::logger> impl) void spdlite::logger::set_impl(std::shared_ptr<spdlog::logger> impl)
{ {
impl_ = std::move(impl); impl_ = std::move(impl);
} }
bool spdlite::logger::should_log(spdlite::level level) const SPDLOG_NOEXCEPT bool spdlite::logger::should_log(spdlite::level level) const SPDLOG_NOEXCEPT
{ {
auto spd_level = to_spdlog_level(level); auto spd_level = to_spdlog_level(level);
return impl_->should_log(spd_level); // TODO avoid the call using local level member? return impl_->should_log(spd_level); // TODO avoid the call using local level member?
} }
void spdlite::logger::log(spdlite::level lvl, const string_view_t &sv) void spdlite::logger::log(spdlite::level lvl, const string_view_t &sv)
{ {
auto spd_level = to_spdlog_level(lvl); auto spd_level = to_spdlog_level(lvl);
impl_->log(spd_level, sv); impl_->log(spd_level, sv);
} }
void spdlite::logger::log_printf(spdlite::level lvl, const char *format, va_list args) void spdlite::logger::log_printf(spdlite::level lvl, const char *format, va_list args)
{ {
char buffer[256]; char buffer[256];
auto size = vsnprintf(buffer, sizeof(buffer), format, args); auto size = vsnprintf(buffer, sizeof(buffer), format, args);
if (size < 0) if (size < 0)
{ {
size = snprintf(buffer, sizeof(buffer), "invalid format (%s)", format); size = snprintf(buffer, sizeof(buffer), "invalid format (%s)", format);
} }
log(lvl, string_view_t{buffer, static_cast<size_t>(size)}); log(lvl, string_view_t{buffer, static_cast<size_t>(size)});
} }
void spdlite::logger::trace_printf(const char *format, ...) void spdlite::logger::trace_printf(const char *format, ...)
{ {
va_list args; va_list args;
va_start(args, format); va_start(args, format);
log_printf(spdlite::level::trace, format, args); log_printf(spdlite::level::trace, format, args);
va_end(args); va_end(args);
} }
void spdlite::logger::debug_printf(const char *format, ...) void spdlite::logger::debug_printf(const char *format, ...)
{ {
va_list args; va_list args;
va_start(args, format); va_start(args, format);
log_printf(spdlite::level::debug, format, args); log_printf(spdlite::level::debug, format, args);
va_end(args); va_end(args);
} }
void spdlite::logger::info_printf(const char *format, ...) void spdlite::logger::info_printf(const char *format, ...)
{ {
va_list args; va_list args;
va_start(args, format); va_start(args, format);
log_printf(spdlite::level::info, format, args); log_printf(spdlite::level::info, format, args);
va_end(args); va_end(args);
} }
void spdlite::logger::warn_printf(const char *format, ...) void spdlite::logger::warn_printf(const char *format, ...)
{ {
va_list args; va_list args;
va_start(args, format); va_start(args, format);
log_printf(spdlite::level::warn, format, args); log_printf(spdlite::level::warn, format, args);
va_end(args); va_end(args);
} }
void spdlite::logger::error_printf(const char *format, ...) void spdlite::logger::error_printf(const char *format, ...)
{ {
va_list args; va_list args;
va_start(args, format); va_start(args, format);
log_printf(spdlite::level::err, format, args); log_printf(spdlite::level::err, format, args);
va_end(args); va_end(args);
} }
void spdlite::logger::critical_printf(const char *format, ...) void spdlite::logger::critical_printf(const char *format, ...)
{ {
va_list args; va_list args;
va_start(args, format); va_start(args, format);
log_printf(spdlite::level::critical, format, args); log_printf(spdlite::level::critical, format, args);
va_end(args); va_end(args);
} }
void spdlite::logger::set_level(spdlite::level level) noexcept void spdlite::logger::set_level(spdlite::level level) noexcept
{ {
auto spd_level = to_spdlog_level(level); auto spd_level = to_spdlog_level(level);
impl_->set_level(spd_level); impl_->set_level(spd_level);
} }
spdlite::level spdlite::logger::level() const noexcept spdlite::level spdlite::logger::level() const noexcept
{ {
return to_lite_level(impl_->level()); return to_lite_level(impl_->level());
} }
std::string spdlite::logger::name() const noexcept std::string spdlite::logger::name() const noexcept
{ {
return impl_->name(); return impl_->name();
} }
void spdlite::logger::flush() void spdlite::logger::flush()
{ {
impl_->flush(); impl_->flush();
} }
void spdlite::logger::flush_on(spdlite::level level) void spdlite::logger::flush_on(spdlite::level level)
{ {
auto spd_level = to_spdlog_level(level); auto spd_level = to_spdlog_level(level);
impl_->flush_on(spd_level); impl_->flush_on(spd_level);
} }
spdlite::level spdlite::logger::flush_level() const noexcept spdlite::level spdlite::logger::flush_level() const noexcept
{ {
return to_lite_level(impl_->flush_level()); return to_lite_level(impl_->flush_level());
} }
// pattern // pattern
void spdlite::logger::set_pattern(std::string pattern) noexcept void spdlite::logger::set_pattern(std::string pattern) noexcept
{ {
impl_->set_pattern(std::move(pattern)); impl_->set_pattern(std::move(pattern));
} }
spdlite::logger spdlite::logger::clone(std::string logger_name) spdlite::logger spdlite::logger::clone(std::string logger_name)
{ {
return spdlite::logger(impl_->clone(std::move(logger_name))); return spdlite::logger(impl_->clone(std::move(logger_name)));
} }
void spdlite::logger::log_formatted_(spdlite::level lvl, const fmt::memory_buffer &formatted) void spdlite::logger::log_formatted_(spdlite::level lvl, const fmt::memory_buffer &formatted)
{ {
auto spd_level = to_spdlog_level(lvl); auto spd_level = to_spdlog_level(lvl);
impl_->log(spd_level, spdlog::details::fmt_helper::to_string_view(formatted)); impl_->log(spd_level, spdlog::details::fmt_helper::to_string_view(formatted));
} }
spdlite::logger &spdlite::logger::default_logger() spdlite::logger &spdlite::logger::default_logger()
{ {
static spdlite::logger default_inst_ = spdlite::logger(spdlog::default_logger()); static spdlite::logger default_inst_ = spdlite::logger(spdlog::default_logger());
return default_inst_; return default_inst_;
} }
lite/spdlite_global.cpp → spdlite/src/spdlite_global.cpp
View file @ f36be4d5
// Copyright(c) 2015-present Gabi Melman. // Copyright(c) 2015-present Gabi Melman.
// Distributed under the MIT License (http://opensource.org/licenses/MIT) // Distributed under the MIT License (http://opensource.org/licenses/MIT)
#include "spdlite_global.h" #include "spdlite/spdlite_global.h"
spdlite::logger &spdlite::default_logger() spdlite::logger &spdlite::default_logger()
{ {
return spdlite::logger::default_logger(); return spdlite::logger::default_logger();
} }
// printf // printf
void spdlite::log_printf(spdlite::level lvl, const char *format, va_list args) void spdlite::log_printf(spdlite::level lvl, const char *format, va_list args)
{ {
default_logger().log_printf(lvl, format, args); default_logger().log_printf(lvl, format, args);
} }
void spdlite::trace_printf(const char *format, ...) void spdlite::trace_printf(const char *format, ...)
{ {
va_list args; va_list args;
va_start(args, format); va_start(args, format);
log_printf(level::trace, format, args); log_printf(level::trace, format, args);
va_end(args); va_end(args);
} }
void spdlite::debug_printf(const char *format, ...) void spdlite::debug_printf(const char *format, ...)
{ {
va_list args; va_list args;
va_start(args, format); va_start(args, format);
log_printf(level::debug, format, args); log_printf(level::debug, format, args);
va_end(args); va_end(args);
} }
void spdlite::info_printf(const char *format, ...) void spdlite::info_printf(const char *format, ...)
{ {
va_list args; va_list args;
va_start(args, format); va_start(args, format);
log_printf(level::info, format, args); log_printf(level::info, format, args);
va_end(args); va_end(args);
} }
void spdlite::warn_printf(const char *format, ...) void spdlite::warn_printf(const char *format, ...)
{ {
va_list args; va_list args;
va_start(args, format); va_start(args, format);
log_printf(level::warn, format, args); log_printf(level::warn, format, args);
va_end(args); va_end(args);
} }
void spdlite::error_printf(const char *format, ...) void spdlite::error_printf(const char *format, ...)
{ {
va_list args; va_list args;
va_start(args, format); va_start(args, format);
log_printf(level::err, format, args); log_printf(level::err, format, args);
va_end(args); va_end(args);
} }
void spdlite::critical_printf(const char *format, ...) void spdlite::critical_printf(const char *format, ...)
{ {
va_list args; va_list args;
va_start(args, format); va_start(args, format);
log_printf(level::critical, format, args); log_printf(level::critical, format, args);
va_end(args); va_end(args);
} }
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment