From 4fb0e4efef4501d396a5af9e8d12de52e224c940 Mon Sep 17 00:00:00 2001
From: Guillaume Roguez <guillaume.roguez@savoirfairelinux.com>
Date: Sun, 15 Mar 2015 01:47:39 -0400
Subject: [PATCH] signal: fix includes and debug output
Refs #67228
Change-Id: Ia51c2e789254f9a7349de02c4adf4e132a2bbf6b
---
daemon/src/client/signal.h | 22 +++++++++++++++-------
1 file changed, 15 insertions(+), 7 deletions(-)
diff --git a/daemon/src/client/signal.h b/daemon/src/client/signal.h
index 28a66a9057..afdb584bf1 100644
--- a/daemon/src/client/signal.h
+++ b/daemon/src/client/signal.h
@@ -30,18 +30,26 @@
#pragma once
-#include "dring/callmanager_interface.h"
-#include "dring/configurationmanager_interface.h"
-#include "dring/presencemanager_interface.h"
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "callmanager_interface.h"
+#include "configurationmanager_interface.h"
+#include "presencemanager_interface.h"
#ifdef RING_VIDEO
-#include "dring/videomanager_interface.h"
-#endif // RING_VIDEO
+#include "videomanager_interface.h"
+#endif
+#include "dring.h"
#include "logger.h"
#include <exception>
#include <memory>
+#include <map>
+#include <utility>
+#include <string>
namespace ring {
@@ -55,11 +63,11 @@ extern SignalHandlerMap& getSignalHandlers();
template <typename Ts, typename ...Args>
static void emitSignal(Args...args) {
const auto& handlers = getSignalHandlers();
- if (auto cb = *DRing::CallbackWrapper<typename Ts::cb_type> {handlers.at(Ts::name)}) {
+ if (auto cb = *DRing::CallbackWrapper<typename Ts::cb_type>(handlers.at(Ts::name))) {
try {
cb(args...);
} catch (std::exception& e) {
- RING_ERR("Exception during emit signal %d:\n%s", Ts::name, e.what());
+ RING_ERR("Exception during emit signal %s:\n%s", Ts::name, e.what());
}
}
}
--
GitLab