1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52
|
Last-Update: 2018-11-03
Forwarded: https://github.com/lizardfs/lizardfs/pull/785
Bug-Upstream: https://github.com/lizardfs/lizardfs/issues/774
Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=909764
Author: Dmitry Smirnov <onlyjob@member.fsf.org>
Description: compatibility with spdlog >= 1:1.2.0
~~~~
/build/lizardfs-3.13.0~rc1+dfsg/src/common/slogger.cc: In function 'bool lzfs::add_log_file(const char*, lzfs::log_level::LogLevel, int, int)':
/build/lizardfs-3.13.0~rc1+dfsg/src/common/slogger.cc:67:30: error: 'rotating_logger_mt' is not a member of 'spdlog'
LoggerPtr logger = spdlog::rotating_logger_mt(path, path, max_file_size, max_file_count);
^~~~~~~~~~~~~~~~~~
/build/lizardfs-3.13.0~rc1+dfsg/src/common/slogger.cc: In function 'bool lzfs::add_log_syslog()':
/build/lizardfs-3.13.0~rc1+dfsg/src/common/slogger.cc:89:11: error: 'syslog_logger' is not a member of 'spdlog'
spdlog::syslog_logger("syslog");
^~~~~~~~~~~~~
/build/lizardfs-3.13.0~rc1+dfsg/src/common/slogger.cc:89:11: note: suggested alternative: 'register_logger'
spdlog::syslog_logger("syslog");
^~~~~~~~~~~~~
register_logger
/build/lizardfs-3.13.0~rc1+dfsg/src/common/slogger.cc: In function 'bool lzfs::add_log_stderr(lzfs::log_level::LogLevel)':
/build/lizardfs-3.13.0~rc1+dfsg/src/common/slogger.cc:100:30: error: 'stderr_color_mt' is not a member of 'spdlog'
LoggerPtr logger = spdlog::stderr_color_mt("stderr");
^~~~~~~~~~~~~~~
~~~~
--- a/src/common/slogger.h
+++ b/src/common/slogger.h
@@ -26,8 +26,11 @@
#define SPDLOG_ENABLE_SYSLOG
#endif
#include "common/small_vector.h"
#include "spdlog/spdlog.h"
+#include "spdlog/sinks/rotating_file_sink.h"
+#include "spdlog/sinks/syslog_sink.h"
+#include "spdlog/sinks/stdout_color_sinks.h"
typedef std::shared_ptr<spdlog::logger> LoggerPtr;
namespace lzfs {
--- a/src/common/slogger.cc
+++ b/src/common/slogger.cc
@@ -85,9 +85,9 @@
bool lzfs::add_log_syslog() {
#ifndef _WIN32
try {
- spdlog::syslog_logger("syslog");
+ spdlog::syslog_logger_mt("syslog");
return true;
} catch (const spdlog::spdlog_ex &e) {
lzfs_pretty_syslog(LOG_ERR, "Adding syslog log failed: %s", e.what());
}
|