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
53
54
55
56
57
58
59
60
61
62
63
|
Description: use newer spdlog version from Debian package
Forwarded: not-needed
Author: Valentin Vidic <vvidic@debian.org>
Last-Update: 2020-10-18
--- a/src/monitorlogger.h
+++ b/src/monitorlogger.h
@@ -4,6 +4,7 @@
#include <memory>
#include "oscout.h"
#include "spdlog/spdlog.h"
+#include "spdlog/sinks/stdout_sinks.h"
#include "osc_sink.h"
class MonitorLogger {
--- a/src/osc_sink.h
+++ b/src/osc_sink.h
@@ -13,7 +13,7 @@
namespace spdlog {
namespace sinks {
- template <class Mutex>
+ template <typename Mutex>
class osc_sink : public base_sink<Mutex> {
public:
explicit osc_sink(std::shared_ptr<OscOutput> oscOutput)
@@ -21,26 +21,28 @@
{
}
- void flush() override
- {
- }
-
protected:
- void _sink_it(const details::log_msg& msg) override
+ void sink_it_(const details::log_msg &msg) override
{
char buffer[2048];
osc::OutboundPacketStream p(buffer, 2048);
+ memory_buf_t formatted;
+ base_sink<Mutex>::formatter_->format(msg, formatted);
p << osc::BeginMessage("/logging");
- p << msg.formatted.c_str();
+ p << formatted.data();
p << osc::EndMessage;
m_oscOutput->sendUDP(p.Data(), p.Size());
}
+ void flush_() override
+ {
+ }
+
std::shared_ptr<OscOutput> m_oscOutput;
};
- typedef osc_sink<std::mutex> osc_sink_mt;
- typedef osc_sink<details::null_mutex> osc_sink_st;
+ using osc_sink_mt = osc_sink<std::mutex>;
+ using osc_sink_st = osc_sink<details::null_mutex>;
}
}
|
