fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-05 13:28:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

bus: Also tell systemd when we're reloading

Browse source 
Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=104641
This commit is contained in:
Simon McVittie 2018-01-15 15:31:41 +00:00
parent 18a0a8892b
commit c937a39e4b
4 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bus/bus.c
View file

@ -1065,6 +1065,8 @@ bus_context_reload_config (BusContext *context,
DBusString config_file;
dbus_bool_t ret;
_dbus_daemon_report_reloading ();
/* Flush the user database cache */
_dbus_flush_caches ();
@ -1095,6 +1097,8 @@ bus_context_reload_config (BusContext *context,
bus_context_log (context, DBUS_SYSTEM_LOG_INFO, "Unable to reload configuration: %s", error->message);
if (parser != NULL)
bus_config_parser_unref (parser);
_dbus_daemon_report_reloaded ();
return ret;
}

25
dbus/dbus-sysdeps-util-unix.c
View file

@ -1531,3 +1531,28 @@ _dbus_daemon_report_ready (void)
sd_notify (0, "READY=1");
#endif
}
/**
* Report to a service manager that the daemon calling this function is
* reloading configuration. This is currently only implemented for systemd.
*/
void
_dbus_daemon_report_reloading (void)
{
#ifdef HAVE_SYSTEMD
sd_notify (0, "RELOADING=1");
#endif
}
/**
* Report to a service manager that the daemon calling this function is
* reloading configuration. This is currently only implemented for systemd.
*/
void
_dbus_daemon_report_reloaded (void)
{
#ifdef HAVE_SYSTEMD
/* For systemd, this is the same code */
_dbus_daemon_report_ready ();
#endif
}

10
dbus/dbus-sysdeps-util-win.c
View file

@ -1659,3 +1659,13 @@ void
_dbus_daemon_report_ready (void)
{
}
void
_dbus_daemon_report_reloading (void)
{
}
void
_dbus_daemon_report_reloaded (void)
{
}

2
dbus/dbus-sysdeps.h
View file

@ -688,6 +688,8 @@ dbus_bool_t _dbus_rlimit_restore_fd_limit (DBusRLimit *saved,
void _dbus_rlimit_free (DBusRLimit *lim);
void _dbus_daemon_report_ready (void);
void _dbus_daemon_report_reloading (void);
void _dbus_daemon_report_reloaded (void);
/** @} */