From 30ce9cccc0a673044f08ffd7880836479608d199 Mon Sep 17 00:00:00 2001
From: Andreas Traczyk <andreas.traczyk@savoirfairelinux.com>
Date: Wed, 15 Aug 2018 13:23:10 -0400
Subject: [PATCH] logger: emits debug signal when compiling with MSC
- also adds the signal to the dbus xml in case other clients/platforms
wish to connect to it in the future
Change-Id: I6d4d85e88e713a7a0ef22ca032653ca5bec188e7
---
bin/dbus/cx.ring.Ring.ConfigurationManager.xml | 12 ++++++++++++
src/logger.cpp | 2 +-
2 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/bin/dbus/cx.ring.Ring.ConfigurationManager.xml b/bin/dbus/cx.ring.Ring.ConfigurationManager.xml
index 6881f7fae8..a3d5e02d34 100644
--- a/bin/dbus/cx.ring.Ring.ConfigurationManager.xml
+++ b/bin/dbus/cx.ring.Ring.ConfigurationManager.xml
@@ -1533,5 +1533,17 @@
</tp:docstring>
</arg>
</signal>
+
+ <signal name="debugMessageReceived" tp:name-for-bindings="debugMessageReceived">
+ <tp:added version="5.2.0"/>
+ <tp:docstring>
+ Notify clients when debug is outputted.
+ </tp:docstring>
+ <arg type="s" name="message">
+ <tp:docstring>
+ The formatted message to be output.
+ </tp:docstring>
+ </arg>
+ </signal>
</interface>
</node>
diff --git a/src/logger.cpp b/src/logger.cpp
index 9806f3979f..4b5acf2dac 100644
--- a/src/logger.cpp
+++ b/src/logger.cpp
@@ -265,7 +265,7 @@ Logger::vlog(const int level, const char* file, int line, bool linefeed,
SetConsoleTextAttribute(hConsole, color_header);
#endif
fputs(contextHeader(file, line).c_str(), stderr);
-#ifdef RING_UWP
+#ifdef _MSC_VER
std::array<char, 4096> tmp;
vsnprintf(tmp.data(), tmp.size(), format, ap);
ring::emitSignal<DRing::DebugSignal::MessageSend>(contextHeader(file, line) + tmp.data());
--
GitLab