summaryrefslogtreecommitdiff
path: root/bus/activation.c
diff options
context:
space:
mode:
authorChengwei Yang <chengwei.yang@intel.com>2013-10-15 13:04:53 +0800
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2013-11-01 12:40:41 +0000
commitec6ea1a6a8ad1d5e3c1280a55207e9b4f5742814 (patch)
treef296d80fd62514673f05202321047d7a371639a0 /bus/activation.c
parentf110f0011600f80bb50a9037e5fdcf5296fc1fde (diff)
downloaddbus-ec6ea1a6a8ad1d5e3c1280a55207e9b4f5742814.tar.gz
DBusBabysitter: change executable to log_name
DBusBabysitter->executable is defined as executable name to use in error messages. However, if servicehelper used, then the executable name is servicehelper. It's not much help because we couldn't figure out which service we're trying to activated if error happens. In the following patch, we'll use service name to be activated as the child log identifier and add a parameter to _dbus_spawn_async_with_babysitter() to pass the log identifier. Since this is not the case in test, so executable changed to log_name. Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68559 Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Diffstat (limited to 'bus/activation.c')
-rw-r--r--bus/activation.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/bus/activation.c b/bus/activation.c
index 77357bea..868ce05c 100644
--- a/bus/activation.c
+++ b/bus/activation.c
@@ -2104,7 +2104,9 @@ bus_activation_activate_service (BusActivation *activation,
dbus_error_init (&tmp_error);
- if (!_dbus_spawn_async_with_babysitter (&pending_activation->babysitter, argv,
+ if (!_dbus_spawn_async_with_babysitter (&pending_activation->babysitter,
+ service_name,
+ argv,
envp,
NULL, activation,
&tmp_error))