X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fservice.c;h=8097e26b0034bac306813b92d4e26815ad8e7d6d;hb=d14ab08b29d5b0b3ead6e63ac8be472f273011f9;hp=fa470619389b1b157e27ba332023acaa5f5685be;hpb=bf108e5541e2a3cbc6f0c59e93665eceb7a5ce05;p=elogind.git diff --git a/src/core/service.c b/src/core/service.c index fa4706193..8097e26b0 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -1750,7 +1750,7 @@ static int service_spawn( if (r < 0) goto fail; - our_env = new0(char*, 5); + our_env = new0(char*, 4); if (!our_env) { r = -ENOMEM; goto fail; @@ -1768,12 +1768,6 @@ static int service_spawn( goto fail; } - if (s->watchdog_usec > 0) - if (asprintf(our_env + n_env++, "WATCHDOG_USEC=%llu", (unsigned long long) s->watchdog_usec) < 0) { - r = -ENOMEM; - goto fail; - } - if (UNIT(s)->manager->running_as != SYSTEMD_SYSTEM) if (asprintf(our_env + n_env++, "MANAGERPID=%lu", (unsigned long) getpid()) < 0) { r = -ENOMEM; @@ -1804,6 +1798,7 @@ static int service_spawn( UNIT(s)->manager->cgroup_supported, path, UNIT(s)->id, + s->watchdog_usec, s->type == SERVICE_IDLE ? UNIT(s)->manager->idle_pipe : NULL, s->exec_runtime, &pid); @@ -3342,6 +3337,7 @@ static void service_notify_cgroup_empty_event(Unit *u) { static void service_notify_message(Unit *u, pid_t pid, char **tags) { Service *s = SERVICE(u); const char *e; + bool notify_dbus = false; assert(u); @@ -3359,8 +3355,7 @@ static void service_notify_message(Unit *u, pid_t pid, char **tags) { return; } - log_debug_unit(u->id, - "%s: Got message", u->id); + log_debug_unit(u->id, "%s: Got message", u->id); /* Interpret MAINPID= */ if ((e = strv_find_prefix(tags, "MAINPID=")) && @@ -3370,24 +3365,20 @@ static void service_notify_message(Unit *u, pid_t pid, char **tags) { s->state == SERVICE_RELOAD)) { if (parse_pid(e + 8, &pid) < 0) - log_warning_unit(u->id, - "Failed to parse notification message %s", e); + log_warning_unit(u->id, "Failed to parse notification message %s", e); else { - log_debug_unit(u->id, - "%s: got %s", u->id, e); + log_debug_unit(u->id, "%s: got %s", u->id, e); service_set_main_pid(s, pid); unit_watch_pid(UNIT(s), pid); + notify_dbus = true; } } /* Interpret READY= */ - if (s->type == SERVICE_NOTIFY && - s->state == SERVICE_START && - strv_find(tags, "READY=1")) { - log_debug_unit(u->id, - "%s: got READY=1", u->id); - + if (s->type == SERVICE_NOTIFY && s->state == SERVICE_START && strv_find(tags, "READY=1")) { + log_debug_unit(u->id, "%s: got READY=1", u->id); service_enter_start_post(s); + notify_dbus = true; } /* Interpret STATUS= */ @@ -3396,39 +3387,39 @@ static void service_notify_message(Unit *u, pid_t pid, char **tags) { char *t; if (e[7]) { - if (!utf8_is_valid(e+7)) { - log_warning_unit(u->id, - "Status message in notification is not UTF-8 clean."); + log_warning_unit(u->id, "Status message in notification is not UTF-8 clean."); return; } + log_debug_unit(u->id, "%s: got %s", u->id, e); + t = strdup(e+7); if (!t) { - log_error_unit(u->id, - "Failed to allocate string."); + log_oom(); return; } - log_debug_unit(u->id, - "%s: got %s", u->id, e); + } else + t = NULL; + if (!streq_ptr(s->status_text, t)) { free(s->status_text); s->status_text = t; - } else { - free(s->status_text); - s->status_text = NULL; - } - + notify_dbus = true; + } else + free(t); } + /* Interpet WATCHDOG= */ if (strv_find(tags, "WATCHDOG=1")) { log_debug_unit(u->id, "%s: got WATCHDOG=1", u->id); service_reset_watchdog(s); } /* Notify clients about changed status or main pid */ - unit_add_to_dbus_queue(u); + if (notify_dbus) + unit_add_to_dbus_queue(u); } #ifdef HAVE_SYSV_COMPAT @@ -3665,6 +3656,8 @@ static void service_bus_name_owner_change( } int service_set_socket_fd(Service *s, int fd, Socket *sock) { + _cleanup_free_ char *peer = NULL; + int r; assert(s); assert(fd >= 0); @@ -3682,6 +3675,23 @@ int service_set_socket_fd(Service *s, int fd, Socket *sock) { if (s->state != SERVICE_DEAD) return -EAGAIN; + if (getpeername_pretty(fd, &peer) >= 0) { + + if (UNIT(s)->description) { + _cleanup_free_ char *a; + + a = strjoin(UNIT(s)->description, " (", peer, ")", NULL); + if (!a) + return -ENOMEM; + + r = unit_set_description(UNIT(s), a); + } else + r = unit_set_description(UNIT(s), peer); + + if (r < 0) + return r; + } + s->socket_fd = fd; unit_ref_set(&s->accept_socket, UNIT(sock)); @@ -3840,7 +3850,6 @@ const UnitVTable service_vtable = { .bus_interface = "org.freedesktop.systemd1.Service", .bus_vtable = bus_service_vtable, - .bus_changing_properties = bus_service_changing_properties, .bus_set_property = bus_service_set_property, .bus_commit_properties = bus_service_commit_properties,