TeaSpeak/spdlog
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v1.x' into pwm1234/rotate_on_open

Browse Source
This commit is contained in:
Philip Miller 2019-01-23 21:44:27 -05:00
commit cce1e36e26
18 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -4,7 +4,7 @@
# #
cmake_minimum_required(VERSION 3.1) cmake_minimum_required(VERSION 3.1)
project(spdlog VERSION 1.3.0 LANGUAGES CXX) project(spdlog VERSION 1.3.1 LANGUAGES CXX)
include(CMakeDependentOption) include(CMakeDependentOption)
include(GNUInstallDirs) include(GNUInstallDirs)
@ -30,7 +30,6 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" MATCH
add_compile_options("-Wconversion") add_compile_options("-Wconversion")
add_compile_options("-pedantic") add_compile_options("-pedantic")
add_compile_options("-Wfatal-errors") add_compile_options("-Wfatal-errors")
endif() endif()
#--------------------------------------------------------------------------------------- #---------------------------------------------------------------------------------------
@ -47,11 +46,11 @@ add_library(spdlog::spdlog ALIAS spdlog)
# Check if spdlog is being used directly or via add_subdirectory # Check if spdlog is being used directly or via add_subdirectory
set(SPDLOG_MASTER_PROJECT OFF) set(SPDLOG_MASTER_PROJECT OFF)
if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR) if (CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
set(SPDLOG_MASTER_PROJECT ON) set(SPDLOG_MASTER_PROJECT ON)
endif() endif()
option(SPDLOG_BUILD_EXAMPLES "Build examples" ${SPDLOG_MASTER_PROJECT}) option(SPDLOG_BUILD_EXAMPLES "Build examples" ${SPDLOG_MASTER_PROJECT})
option(SPDLOG_BUILD_BENCH "Build benchmarks" ${SPDLOG_MASTER_PROJECT}) option(SPDLOG_BUILD_BENCH "Build benchmarks (Requires https://github.com/google/benchmark.git to be installed)" OFF)
option(SPDLOG_BUILD_TESTS "Build tests" ${SPDLOG_MASTER_PROJECT}) option(SPDLOG_BUILD_TESTS "Build tests" ${SPDLOG_MASTER_PROJECT})
option(SPDLOG_FMT_EXTERNAL "Use external fmt library instead of bundled" OFF) option(SPDLOG_FMT_EXTERNAL "Use external fmt library instead of bundled" OFF)

2
README.md
View File

@ -91,7 +91,7 @@ int main()
spdlog::info("Positional args are {1} {0}..", "too", "supported"); spdlog::info("Positional args are {1} {0}..", "too", "supported");
spdlog::info("{:<30}", "left aligned"); spdlog::info("{:<30}", "left aligned");
spdlog::set_level(spdlog::level::debug/ Set global log level to debug spdlog::set_level(spdlog::level::debug); // Set global log level to debug
spdlog::debug("This message should be displayed.."); spdlog::debug("This message should be displayed..");
// change log pattern // change log pattern

11
bench/CMakeLists.txt
View File

@ -30,20 +30,19 @@ if(NOT TARGET spdlog)
endif() endif()
find_package(Threads REQUIRED) find_package(Threads REQUIRED)
find_package(benchmark CONFIG REQUIRED)
add_executable(bench bench.cpp) add_executable(bench bench.cpp)
target_link_libraries(bench spdlog::spdlog Threads::Threads) target_link_libraries(bench PRIVATE spdlog::spdlog Threads::Threads)
add_executable(async_bench async_bench.cpp) add_executable(async_bench async_bench.cpp)
target_link_libraries(async_bench spdlog::spdlog Threads::Threads) target_link_libraries(async_bench PRIVATE spdlog::spdlog Threads::Threads)
add_executable(latency latency.cpp) add_executable(latency latency.cpp)
set(CMAKE_CXX_STANDARD_LIBRARIES -lbenchmark) target_link_libraries(latency PRIVATE benchmark::benchmark spdlog::spdlog Threads::Threads)
target_link_libraries(latency spdlog::spdlog Threads::Threads)
add_executable(formatter-bench formatter-bench.cpp) add_executable(formatter-bench formatter-bench.cpp)
set(CMAKE_CXX_STANDARD_LIBRARIES -lbenchmark) target_link_libraries(formatter-bench PRIVATE benchmark::benchmark spdlog::spdlog Threads::Threads)
target_link_libraries(formatter-bench spdlog::spdlog Threads::Threads)
file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/logs") file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/logs")

2
include/spdlog/details/log_msg.h
View File

@ -25,9 +25,9 @@ struct log_msg
#ifndef SPDLOG_NO_THREAD_ID #ifndef SPDLOG_NO_THREAD_ID
, thread_id(os::thread_id()) , thread_id(os::thread_id())
#endif
, source(loc) , source(loc)
, payload(view) , payload(view)
#endif
{ {
} }

2
include/spdlog/sinks/android_sink.h
View File

@ -6,7 +6,7 @@
#pragma once #pragma once
#ifndef SPDLOG_H #ifndef SPDLOG_H
#error "spdlog.h must be included before this file." #include "spdlog/spdlog.h"
#endif #endif
#include "spdlog/details/fmt_helper.h" #include "spdlog/details/fmt_helper.h"

2
include/spdlog/sinks/ansicolor_sink.h
View File

@ -6,7 +6,7 @@
#pragma once #pragma once
#ifndef SPDLOG_H #ifndef SPDLOG_H
#error "spdlog.h must be included before this file." #include "spdlog/spdlog.h"
#endif #endif
#include "spdlog/details/console_globals.h" #include "spdlog/details/console_globals.h"

7
include/spdlog/sinks/basic_file_sink.h
View File

@ -6,7 +6,7 @@
#pragma once #pragma once
#ifndef SPDLOG_H #ifndef SPDLOG_H
#error "spdlog.h must be included before this file." #include "spdlog/spdlog.h"
#endif #endif
#include "spdlog/details/file_helper.h" #include "spdlog/details/file_helper.h"
@ -30,6 +30,11 @@ public:
file_helper_.open(filename, truncate); file_helper_.open(filename, truncate);
} }
const filename_t &filename() const
{
return file_helper_.filename();
}
protected: protected:
void sink_it_(const details::log_msg &msg) override void sink_it_(const details::log_msg &msg) override
{ {

7
include/spdlog/sinks/daily_file_sink.h
View File

@ -6,7 +6,7 @@
#pragma once #pragma once
#ifndef SPDLOG_H #ifndef SPDLOG_H
#error "spdlog.h must be included before this file." #include "spdlog/spdlog.h"
#endif #endif
#include "spdlog/details/file_helper.h" #include "spdlog/details/file_helper.h"
@ -63,6 +63,11 @@ public:
rotation_tp_ = next_rotation_tp_(); rotation_tp_ = next_rotation_tp_();
} }
const filename_t &filename() const
{
return file_helper_.filename();
}
protected: protected:
void sink_it_(const details::log_msg &msg) override void sink_it_(const details::log_msg &msg) override
{ {

2
include/spdlog/sinks/dist_sink.h
View File

@ -6,7 +6,7 @@
#pragma once #pragma once
#ifndef SPDLOG_H #ifndef SPDLOG_H
#error "spdlog.h must be included before this file." #include "spdlog/spdlog.h"
#endif #endif
#include "base_sink.h" #include "base_sink.h"

2
include/spdlog/sinks/msvc_sink.h
View File

@ -6,7 +6,7 @@
#pragma once #pragma once
#ifndef SPDLOG_H #ifndef SPDLOG_H
#error "spdlog.h must be included before this file." #include "spdlog/spdlog.h"
#endif #endif
#if defined(_WIN32) #if defined(_WIN32)

2
include/spdlog/sinks/null_sink.h
View File

@ -6,7 +6,7 @@
#pragma once #pragma once
#ifndef SPDLOG_H #ifndef SPDLOG_H
#error "spdlog.h must be included before this file." #include "spdlog/spdlog.h"
#endif #endif
#include "spdlog/details/null_mutex.h" #include "spdlog/details/null_mutex.h"

2
include/spdlog/sinks/ostream_sink.h
View File

@ -6,7 +6,7 @@
#pragma once #pragma once
#ifndef SPDLOG_H #ifndef SPDLOG_H
#error "spdlog.h must be included before this file." #include "spdlog/spdlog.h"
#endif #endif
#include "spdlog/details/null_mutex.h" #include "spdlog/details/null_mutex.h"

7
include/spdlog/sinks/rotating_file_sink.h
View File

@ -6,7 +6,7 @@
#pragma once #pragma once
#ifndef SPDLOG_H #ifndef SPDLOG_H
#error "spdlog.h must be included before this file." #include "spdlog/spdlog.h"
#endif #endif
#include "spdlog/details/file_helper.h" #include "spdlog/details/file_helper.h"
@ -60,6 +60,11 @@ public:
return fmt::to_string(w); return fmt::to_string(w);
} }
const filename_t &filename() const
{
return file_helper_.filename();
}
protected: protected:
void sink_it_(const details::log_msg &msg) override void sink_it_(const details::log_msg &msg) override
{ {

2
include/spdlog/sinks/stdout_color_sinks.h
View File

@ -6,7 +6,7 @@
#pragma once #pragma once
#ifndef SPDLOG_H #ifndef SPDLOG_H
#error "spdlog.h must be included before this file." #include "spdlog/spdlog.h"
#endif #endif
#ifdef _WIN32 #ifdef _WIN32

2
include/spdlog/sinks/stdout_sinks.h
View File

@ -6,7 +6,7 @@
#pragma once #pragma once
#ifndef SPDLOG_H #ifndef SPDLOG_H
#error "spdlog.h must be included before this file." #include "spdlog/spdlog.h"
#endif #endif
#include "spdlog/details/console_globals.h" #include "spdlog/details/console_globals.h"

2
include/spdlog/sinks/syslog_sink.h
View File

@ -6,7 +6,7 @@
#pragma once #pragma once
#ifndef SPDLOG_H #ifndef SPDLOG_H
#error "spdlog.h must be included before this file." #include "spdlog/spdlog.h"
#endif #endif
#include "spdlog/sinks/base_sink.h" #include "spdlog/sinks/base_sink.h"

2
include/spdlog/sinks/wincolor_sink.h
View File

@ -6,7 +6,7 @@
#pragma once #pragma once
#ifndef SPDLOG_H #ifndef SPDLOG_H
#error "spdlog.h must be included before this file." #include "spdlog/spdlog.h"
#endif #endif
#include "spdlog/common.h" #include "spdlog/common.h"

2
include/spdlog/version.h
View File

@ -7,6 +7,6 @@
#define SPDLOG_VER_MAJOR 1 #define SPDLOG_VER_MAJOR 1
#define SPDLOG_VER_MINOR 3 #define SPDLOG_VER_MINOR 3
#define SPDLOG_VER_PATCH 0 #define SPDLOG_VER_PATCH 1
#define SPDLOG_VERSION (SPDLOG_VER_MAJOR * 10000 + SPDLOG_VER_MINOR * 100 + SPDLOG_VER_PATCH) #define SPDLOG_VERSION (SPDLOG_VER_MAJOR * 10000 + SPDLOG_VER_MINOR * 100 + SPDLOG_VER_PATCH)