Commit c937a39e authored by Simon McVittie's avatar Simon McVittie

bus: Also tell systemd when we're reloading

Signed-off-by: Simon McVittie's avatarSimon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall's avatarPhilip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=104641
parent 18a0a889
......@@ -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;
}
......
......@@ -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
}
......@@ -1659,3 +1659,13 @@ void
_dbus_daemon_report_ready (void)
{
}
void
_dbus_daemon_report_reloading (void)
{
}
void
_dbus_daemon_report_reloaded (void)
{
}
......@@ -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);
/** @} */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment