Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
jami-daemon
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
savoirfairelinux
jami-daemon
Commits
4fb0e4ef
Commit
4fb0e4ef
authored
10 years ago
by
Guillaume Roguez
Browse files
Options
Downloads
Patches
Plain Diff
signal: fix includes and debug output
Refs #67228 Change-Id: Ia51c2e789254f9a7349de02c4adf4e132a2bbf6b
parent
ca2223a8
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
daemon/src/client/signal.h
+15
-7
15 additions, 7 deletions
daemon/src/client/signal.h
with
15 additions
and
7 deletions
daemon/src/client/signal.h
+
15
−
7
View file @
4fb0e4ef
...
@@ -30,18 +30,26 @@
...
@@ -30,18 +30,26 @@
#pragma once
#pragma once
#include
"dring/callmanager_interface.h"
#ifdef HAVE_CONFIG_H
#include
"dring/configurationmanager_interface.h"
#include
"config.h"
#include
"dring/presencemanager_interface.h"
#endif
#include
"callmanager_interface.h"
#include
"configurationmanager_interface.h"
#include
"presencemanager_interface.h"
#ifdef RING_VIDEO
#ifdef RING_VIDEO
#include
"
dring/
videomanager_interface.h"
#include
"videomanager_interface.h"
#endif
// RING_VIDEO
#endif
#include
"dring.h"
#include
"logger.h"
#include
"logger.h"
#include
<exception>
#include
<exception>
#include
<memory>
#include
<memory>
#include
<map>
#include
<utility>
#include
<string>
namespace
ring
{
namespace
ring
{
...
@@ -55,11 +63,11 @@ extern SignalHandlerMap& getSignalHandlers();
...
@@ -55,11 +63,11 @@ extern SignalHandlerMap& getSignalHandlers();
template
<
typename
Ts
,
typename
...
Args
>
template
<
typename
Ts
,
typename
...
Args
>
static
void
emitSignal
(
Args
...
args
)
{
static
void
emitSignal
(
Args
...
args
)
{
const
auto
&
handlers
=
getSignalHandlers
();
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
{
try
{
cb
(
args
...);
cb
(
args
...);
}
catch
(
std
::
exception
&
e
)
{
}
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
());
}
}
}
}
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment