summaryrefslogtreecommitdiff
path: root/src/hostnamed.c
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-09-03 03:26:58 +0200
committerLennart Poettering <lennart@poettering.net>2011-09-03 03:26:58 +0200
commitad740100d108282d0244d5739d4dcc86fe4c5fde (patch)
tree0f2be481f6ac03fb5426e450978c558c3be89ffa /src/hostnamed.c
parent43de46ab92e3b343c2e35b42cf0728a9adf48f1c (diff)
dbus: terminate mechanism daemons after a while
Diffstat (limited to 'src/hostnamed.c')
-rw-r--r--src/hostnamed.c22
1 files changed, 19 insertions, 3 deletions
diff --git a/src/hostnamed.c b/src/hostnamed.c
index e3b89a4c62..9e8825da75 100644
--- a/src/hostnamed.c
+++ b/src/hostnamed.c
@@ -30,6 +30,7 @@
#include "strv.h"
#include "dbus-common.h"
#include "polkit.h"
+#include "def.h"
#define INTERFACE \
" <interface name=\"org.freedesktop.hostname1\">\n" \
@@ -85,6 +86,8 @@ static char *data[_PROP_MAX] = {
NULL
};
+static usec_t remain_until = 0;
+
static void free_data(void) {
int p;
@@ -518,7 +521,10 @@ static int connect_bus(DBusConnection **_bus) {
goto fail;
}
- if (!dbus_connection_register_object_path(bus, "/org/freedesktop/hostname1", &hostname_vtable, NULL)) {
+ dbus_connection_set_exit_on_disconnect(bus, FALSE);
+
+ if (!dbus_connection_register_object_path(bus, "/org/freedesktop/hostname1", &hostname_vtable, NULL) ||
+ !dbus_connection_add_filter(bus, bus_exit_idle_filter, &remain_until, NULL)) {
log_error("Not enough memory");
r = -ENOMEM;
goto fail;
@@ -554,6 +560,7 @@ fail:
int main(int argc, char *argv[]) {
int r;
DBusConnection *bus = NULL;
+ bool exiting = false;
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
@@ -588,8 +595,17 @@ int main(int argc, char *argv[]) {
if (r < 0)
goto finish;
- while (dbus_connection_read_write_dispatch(bus, -1))
- ;
+ remain_until = now(CLOCK_MONOTONIC) + DEFAULT_EXIT_USEC;
+ for (;;) {
+
+ if (!dbus_connection_read_write_dispatch(bus, exiting ? -1 : (int) (DEFAULT_EXIT_USEC/USEC_PER_MSEC)))
+ break;
+
+ if (!exiting && remain_until < now(CLOCK_MONOTONIC)) {
+ exiting = true;
+ bus_async_unregister_and_exit(bus, "org.freedesktop.hostname1");
+ }
+ }
r = 0;