spdlog.patch

   1 diff --color -ur lizardfs-3.12.0.orig/cmake/Libraries.cmake lizardfs-3.12.0/cmake/Libraries.cmake
   2 --- lizardfs-3.12.0.orig/cmake/Libraries.cmake  2020-11-02 10:38:47.225851923 +0100
   3 +++ lizardfs-3.12.0/cmake/Libraries.cmake       2020-11-02 00:20:25.942367760 +0100
   4 @@ -3,6 +3,7 @@
   5  # Find standard libraries
   6  find_package(Socket REQUIRED)
   7  find_package(Threads REQUIRED)
   8 +find_package(spdlog REQUIRED)
   9
  10  if(NOT MINGW)
  11    find_package(FUSE REQUIRED)
  12 Only in lizardfs-3.12.0.orig/external: spdlog-1.patch
  13 diff --color -ur lizardfs-3.12.0.orig/src/common/CMakeLists.txt lizardfs-3.12.0/src/common/CMakeLists.txt
  14 --- lizardfs-3.12.0.orig/src/common/CMakeLists.txt      2017-12-20 10:59:37.000000000 +0100
  15 +++ lizardfs-3.12.0/src/common/CMakeLists.txt   2020-11-02 00:39:44.764135292 +0100
  16 @@ -16,6 +16,7 @@
  17
  18
  19  shared_add_library(mfscommon ${COMMON_SOURCES})
  20 +shared_target_link_libraries(mfscommon spdlog::spdlog)
  21  if (HAVE_CRCUTIL)
  22    # Use crcutil Library
  23    include_directories(${CRCUTIL_INCLUDE_DIRS})
  24 diff --color -ur lizardfs-3.12.0.orig/src/common/slogger.cc lizardfs-3.12.0/src/common/slogger.cc
  25 --- lizardfs-3.12.0.orig/src/common/slogger.cc  2017-12-20 10:59:37.000000000 +0100
  26 +++ lizardfs-3.12.0/src/common/slogger.cc       2020-11-02 01:00:00.514731900 +0100
  27 @@ -86,7 +86,7 @@
  28  bool lzfs::add_log_syslog() {
  29  #ifndef _WIN32
  30         try {
  31 -               spdlog::syslog_logger("syslog");
  32 +               spdlog::syslog_logger_mt("syslog");
  33                 return true;
  34         } catch (const spdlog::spdlog_ex &e) {
  35                 lzfs_pretty_syslog(LOG_ERR, "Adding syslog log failed: %s", e.what());
  36 @@ -97,7 +97,7 @@
  37
  38  bool lzfs::add_log_stderr(log_level::LogLevel level) {
  39         try {
  40 -               LoggerPtr logger = spdlog::stderr_color_mt("stderr");
  41 +               LoggerPtr logger = spdlog::stderr_color_mt("stderr", spdlog::color_mode::automatic);
  42                 logger->set_level((spdlog::level::level_enum)level);
  43                 // Format: DATE TIME [LEVEL] [PID:TID] : MESSAGE
  44                 logger->set_pattern("%D %H:%M:%S.%e [%l] [%P:%t] : %v");
  45 diff --color -ur lizardfs-3.12.0.orig/src/common/slogger.h lizardfs-3.12.0/src/common/slogger.h
  46 --- lizardfs-3.12.0.orig/src/common/slogger.h   2020-11-02 10:38:47.225851923 +0100
  47 +++ lizardfs-3.12.0/src/common/slogger.h        2020-11-02 00:55:45.381041431 +0100
  48 @@ -30,6 +30,9 @@
  49  #define SPDLOG_DISABLE_TID_CACHING
  50  #endif
  51  #include "spdlog/spdlog.h"
  52 +#include "spdlog/sinks/rotating_file_sink.h"
  53 +#include "spdlog/sinks/syslog_sink.h"
  54 +#include "spdlog/sinks/stdout_color_sinks.h"
  55
  56  typedef std::shared_ptr<spdlog::logger> LoggerPtr;
  57
  58 diff --color -ur lizardfs-3.12.0.orig/src/protocol/CMakeLists.txt lizardfs-3.12.0/src/protocol/CMakeLists.txt
  59 --- lizardfs-3.12.0.orig/src/protocol/CMakeLists.txt    2017-12-20 10:59:37.000000000 +0100
  60 +++ lizardfs-3.12.0/src/protocol/CMakeLists.txt 2020-11-02 00:44:04.829051294 +0100
  61 @@ -19,6 +19,7 @@
  62  collect_sources(PROTOCOL)
  63
  64  add_library(lzfsprotocol ${PROTOCOL_SOURCES})
  65 +target_link_libraries(lzfsprotocol mfscommon)
  66
  67  create_unittest(lzfsprotocol ${PROTOCOL_TESTS})
  68  link_unittest(lzfsprotocol mfscommon)