s->timeout_usec = DEFAULT_TIMEOUT_USEC;
s->restart_usec = DEFAULT_RESTART_USEC;
+
+ s->watchdog_watch.type = WATCH_INVALID;
+
s->timer_watch.type = WATCH_INVALID;
#ifdef HAVE_SYSV_COMPAT
s->sysv_start_priority = -1;
s->main_pid = 0;
}
+static void service_unwatch_pid_file(Service *s) {
+ if (!s->pid_file_pathspec)
+ return;
+
+ log_debug("Stopping watch for %s's PID file %s", UNIT(s)->id, s->pid_file_pathspec->path);
+ path_spec_unwatch(s->pid_file_pathspec, UNIT(s));
+ path_spec_done(s->pid_file_pathspec);
+ free(s->pid_file_pathspec);
+ s->pid_file_pathspec = NULL;
+}
+
static int service_set_main_pid(Service *s, pid_t pid) {
pid_t ppid;
unit_ref_unset(&s->accept_socket);
}
+static void service_stop_watchdog(Service *s) {
+ assert(s);
+
+ unit_unwatch_timer(UNIT(s), &s->watchdog_watch);
+ s->watchdog_timestamp.realtime = 0;
+ s->watchdog_timestamp.monotonic = 0;
+}
+
+static void service_enter_dead(Service *s, ServiceResult f, bool allow_restart);
+
+static void service_handle_watchdog(Service *s) {
+ usec_t offset;
+ int r;
+
+ assert(s);
+
+ if (s->watchdog_usec == 0)
+ return;
+
+ offset = now(CLOCK_MONOTONIC) - s->watchdog_timestamp.monotonic;
+ if (offset >= s->watchdog_usec) {
+ log_error("%s watchdog timeout!", UNIT(s)->id);
+ service_enter_dead(s, SERVICE_FAILURE_WATCHDOG, true);
+ return;
+ }
+
+ r = unit_watch_timer(UNIT(s), s->watchdog_usec - offset, &s->watchdog_watch);
+ if (r < 0)
+ log_warning("%s failed to install watchdog timer: %s", UNIT(s)->id, strerror(-r));
+}
+
+static void service_reset_watchdog(Service *s) {
+ assert(s);
+
+ dual_timestamp_get(&s->watchdog_timestamp);
+ service_handle_watchdog(s);
+}
+
static void service_done(Unit *u) {
Service *s = SERVICE(u);
* our resources */
service_unwatch_main_pid(s);
service_unwatch_control_pid(s);
+ service_unwatch_pid_file(s);
if (s->bus_name) {
unit_unwatch_bus_name(u, s->bus_name);
unit_ref_unset(&s->accept_socket);
+ service_stop_watchdog(s);
+
unit_unwatch_timer(u, &s->timer_watch);
}
fprintf(f,
"%sService State: %s\n"
+ "%sResult: %s\n"
+ "%sReload Result: %s\n"
"%sPermissionsStartOnly: %s\n"
"%sRootDirectoryStartOnly: %s\n"
"%sRemainAfterExit: %s\n"
"%sRestart: %s\n"
"%sNotifyAccess: %s\n",
prefix, service_state_to_string(s->state),
+ prefix, service_result_to_string(s->result),
+ prefix, service_result_to_string(s->reload_result),
prefix, yes_no(s->permissions_start_only),
prefix, yes_no(s->root_directory_start_only),
prefix, yes_no(s->remain_after_exit),
return;
}
-static void service_unwatch_pid_file(Service *s) {
- if (!s->pid_file_pathspec)
- return;
-
- log_debug("Stopping watch for %s's PID file %s", UNIT(s)->id, s->pid_file_pathspec->path);
- path_spec_unwatch(s->pid_file_pathspec, UNIT(s));
- path_spec_done(s->pid_file_pathspec);
- free(s->pid_file_pathspec);
- s->pid_file_pathspec = NULL;
-}
-
static void service_set_state(Service *s, ServiceState state) {
ServiceState old_state;
assert(s);
service_connection_unref(s);
}
+ if (state == SERVICE_STOP)
+ service_stop_watchdog(s);
+
/* For the inactive states unit_notify() will trim the cgroup,
* but for exit we have to do that ourselves... */
if (state == SERVICE_EXITED && UNIT(s)->manager->n_reloading <= 0)
if (old_state != state)
log_debug("%s changed %s -> %s", UNIT(s)->id, service_state_to_string(old_state), service_state_to_string(state));
- unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state], !s->reload_failure);
- s->reload_failure = false;
+ unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state], s->reload_result == SERVICE_SUCCESS);
+ s->reload_result = SERVICE_SUCCESS;
}
static int service_coldplug(Unit *u) {
if ((r = unit_watch_pid(UNIT(s), s->control_pid)) < 0)
return r;
+ if (s->deserialized_state == SERVICE_START_POST ||
+ s->deserialized_state == SERVICE_RUNNING)
+ service_handle_watchdog(s);
+
service_set_state(s, s->deserialized_state);
}
-
return 0;
}
return !r;
}
-static void service_enter_dead(Service *s, bool success, bool allow_restart) {
+static void service_enter_dead(Service *s, ServiceResult f, bool allow_restart) {
int r;
assert(s);
- if (!success)
- s->failure = true;
+ if (f != SERVICE_SUCCESS)
+ s->result = f;
if (allow_restart &&
!s->forbid_restart &&
(s->restart == SERVICE_RESTART_ALWAYS ||
- (s->restart == SERVICE_RESTART_ON_SUCCESS && !s->failure) ||
- (s->restart == SERVICE_RESTART_ON_FAILURE && s->failure) ||
- (s->restart == SERVICE_RESTART_ON_ABORT && s->failure &&
- (s->main_exec_status.code == CLD_KILLED ||
- s->main_exec_status.code == CLD_DUMPED)))) {
+ (s->restart == SERVICE_RESTART_ON_SUCCESS && s->result == SERVICE_SUCCESS) ||
+ (s->restart == SERVICE_RESTART_ON_FAILURE && s->result != SERVICE_SUCCESS) ||
+ (s->restart == SERVICE_RESTART_ON_ABORT && (s->result == SERVICE_FAILURE_SIGNAL ||
+ s->result == SERVICE_FAILURE_CORE_DUMP)))) {
- if ((r = unit_watch_timer(UNIT(s), s->restart_usec, &s->timer_watch)) < 0)
+ r = unit_watch_timer(UNIT(s), s->restart_usec, &s->timer_watch);
+ if (r < 0)
goto fail;
service_set_state(s, SERVICE_AUTO_RESTART);
} else
- service_set_state(s, s->failure ? SERVICE_FAILED : SERVICE_DEAD);
+ service_set_state(s, s->result != SERVICE_SUCCESS ? SERVICE_FAILED : SERVICE_DEAD);
s->forbid_restart = false;
fail:
log_warning("%s failed to run install restart timer: %s", UNIT(s)->id, strerror(-r));
- service_enter_dead(s, false, false);
+ service_enter_dead(s, SERVICE_FAILURE_RESOURCES, false);
}
-static void service_enter_signal(Service *s, ServiceState state, bool success);
+static void service_enter_signal(Service *s, ServiceState state, ServiceResult f);
-static void service_enter_stop_post(Service *s, bool success) {
+static void service_enter_stop_post(Service *s, ServiceResult f) {
int r;
assert(s);
- if (!success)
- s->failure = true;
+ if (f != SERVICE_SUCCESS)
+ s->result = f;
service_unwatch_control_pid(s);
service_set_state(s, SERVICE_STOP_POST);
} else
- service_enter_signal(s, SERVICE_FINAL_SIGTERM, true);
+ service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_SUCCESS);
return;
fail:
log_warning("%s failed to run 'stop-post' task: %s", UNIT(s)->id, strerror(-r));
- service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
+ service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_FAILURE_RESOURCES);
}
-static void service_enter_signal(Service *s, ServiceState state, bool success) {
+static void service_enter_signal(Service *s, ServiceState state, ServiceResult f) {
int r;
Set *pid_set = NULL;
bool wait_for_exit = false;
assert(s);
- if (!success)
- s->failure = true;
+ if (f != SERVICE_SUCCESS)
+ s->result = f;
if (s->exec_context.kill_mode != KILL_NONE) {
int sig = (state == SERVICE_STOP_SIGTERM || state == SERVICE_FINAL_SIGTERM) ? s->exec_context.kill_signal : SIGKILL;
service_set_state(s, state);
} else if (state == SERVICE_STOP_SIGTERM || state == SERVICE_STOP_SIGKILL)
- service_enter_stop_post(s, true);
+ service_enter_stop_post(s, SERVICE_SUCCESS);
else
- service_enter_dead(s, true, true);
+ service_enter_dead(s, SERVICE_SUCCESS, true);
return;
log_warning("%s failed to kill processes: %s", UNIT(s)->id, strerror(-r));
if (state == SERVICE_STOP_SIGTERM || state == SERVICE_STOP_SIGKILL)
- service_enter_stop_post(s, false);
+ service_enter_stop_post(s, SERVICE_FAILURE_RESOURCES);
else
- service_enter_dead(s, false, true);
+ service_enter_dead(s, SERVICE_FAILURE_RESOURCES, true);
if (pid_set)
set_free(pid_set);
}
-static void service_enter_stop(Service *s, bool success) {
+static void service_enter_stop(Service *s, ServiceResult f) {
int r;
assert(s);
- if (!success)
- s->failure = true;
+ if (f != SERVICE_SUCCESS)
+ s->result = f;
service_unwatch_control_pid(s);
service_set_state(s, SERVICE_STOP);
} else
- service_enter_signal(s, SERVICE_STOP_SIGTERM, true);
+ service_enter_signal(s, SERVICE_STOP_SIGTERM, SERVICE_SUCCESS);
return;
fail:
log_warning("%s failed to run 'stop' task: %s", UNIT(s)->id, strerror(-r));
- service_enter_signal(s, SERVICE_STOP_SIGTERM, false);
+ service_enter_signal(s, SERVICE_STOP_SIGTERM, SERVICE_FAILURE_RESOURCES);
}
-static void service_enter_running(Service *s, bool success) {
+static void service_enter_running(Service *s, ServiceResult f) {
int main_pid_ok, cgroup_ok;
assert(s);
- if (!success)
- s->failure = true;
+ if (f != SERVICE_SUCCESS)
+ s->result = f;
main_pid_ok = main_pid_good(s);
cgroup_ok = cgroup_good(s);
else if (s->remain_after_exit)
service_set_state(s, SERVICE_EXITED);
else
- service_enter_stop(s, true);
+ service_enter_stop(s, SERVICE_SUCCESS);
}
static void service_enter_start_post(Service *s) {
service_unwatch_control_pid(s);
+ if (s->watchdog_usec > 0)
+ service_reset_watchdog(s);
+
if ((s->control_command = s->exec_command[SERVICE_EXEC_START_POST])) {
s->control_command_id = SERVICE_EXEC_START_POST;
service_set_state(s, SERVICE_START_POST);
} else
- service_enter_running(s, true);
+ service_enter_running(s, SERVICE_SUCCESS);
return;
fail:
log_warning("%s failed to run 'start-post' task: %s", UNIT(s)->id, strerror(-r));
- service_enter_stop(s, false);
+ service_enter_stop(s, SERVICE_FAILURE_RESOURCES);
}
static void service_enter_start(Service *s) {
fail:
log_warning("%s failed to run 'start' task: %s", UNIT(s)->id, strerror(-r));
- service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
+ service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_FAILURE_RESOURCES);
}
static void service_enter_start_pre(Service *s) {
fail:
log_warning("%s failed to run 'start-pre' task: %s", UNIT(s)->id, strerror(-r));
- service_enter_dead(s, false, true);
+ service_enter_dead(s, SERVICE_FAILURE_RESOURCES, true);
}
static void service_enter_restart(Service *s) {
goto fail;
}
- service_enter_dead(s, true, false);
+ service_enter_dead(s, SERVICE_SUCCESS, false);
if ((r = manager_add_job(UNIT(s)->manager, JOB_START, UNIT(s), JOB_FAIL, false, &error, NULL)) < 0)
goto fail;
fail:
log_warning("%s failed to schedule restart job: %s", UNIT(s)->id, bus_error(&error, -r));
- service_enter_dead(s, false, false);
+ service_enter_dead(s, SERVICE_FAILURE_RESOURCES, false);
dbus_error_free(&error);
}
service_set_state(s, SERVICE_RELOAD);
} else
- service_enter_running(s, true);
+ service_enter_running(s, SERVICE_SUCCESS);
return;
fail:
log_warning("%s failed to run 'reload' task: %s", UNIT(s)->id, strerror(-r));
- s->reload_failure = true;
- service_enter_running(s, true);
+ s->reload_result = SERVICE_FAILURE_RESOURCES;
+ service_enter_running(s, SERVICE_SUCCESS);
}
-static void service_run_next_control(Service *s, bool success) {
+static void service_run_next_control(Service *s) {
int r;
assert(s);
assert(s->control_command);
assert(s->control_command->command_next);
- if (!success)
- s->failure = true;
-
assert(s->control_command_id != SERVICE_EXEC_START);
s->control_command = s->control_command->command_next;
log_warning("%s failed to run next control task: %s", UNIT(s)->id, strerror(-r));
if (s->state == SERVICE_START_PRE)
- service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
+ service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_FAILURE_RESOURCES);
else if (s->state == SERVICE_STOP)
- service_enter_signal(s, SERVICE_STOP_SIGTERM, false);
+ service_enter_signal(s, SERVICE_STOP_SIGTERM, SERVICE_FAILURE_RESOURCES);
else if (s->state == SERVICE_STOP_POST)
- service_enter_dead(s, false, true);
+ service_enter_dead(s, SERVICE_FAILURE_RESOURCES, true);
else if (s->state == SERVICE_RELOAD) {
- s->reload_failure = true;
- service_enter_running(s, true);
+ s->reload_result = SERVICE_FAILURE_RESOURCES;
+ service_enter_running(s, SERVICE_SUCCESS);
} else
- service_enter_stop(s, false);
+ service_enter_stop(s, SERVICE_FAILURE_RESOURCES);
}
-static void service_run_next_main(Service *s, bool success) {
+static void service_run_next_main(Service *s) {
pid_t pid;
int r;
assert(s->main_command->command_next);
assert(s->type == SERVICE_ONESHOT);
- if (!success)
- s->failure = true;
-
s->main_command = s->main_command->command_next;
service_unwatch_main_pid(s);
fail:
log_warning("%s failed to run next main task: %s", UNIT(s)->id, strerror(-r));
- service_enter_stop(s, false);
+ service_enter_stop(s, SERVICE_FAILURE_RESOURCES);
}
static int service_start(Unit *u) {
return -ECANCELED;
}
- s->failure = false;
+ s->result = SERVICE_SUCCESS;
+ s->reload_result = SERVICE_SUCCESS;
s->main_pid_known = false;
s->main_pid_alien = false;
s->forbid_restart = false;
s->state == SERVICE_START ||
s->state == SERVICE_START_POST ||
s->state == SERVICE_RELOAD) {
- service_enter_signal(s, SERVICE_STOP_SIGTERM, true);
+ service_enter_signal(s, SERVICE_STOP_SIGTERM, SERVICE_SUCCESS);
return 0;
}
assert(s->state == SERVICE_RUNNING ||
s->state == SERVICE_EXITED);
- service_enter_stop(s, true);
+ service_enter_stop(s, SERVICE_SUCCESS);
return 0;
}
assert(fds);
unit_serialize_item(u, f, "state", service_state_to_string(s->state));
- unit_serialize_item(u, f, "failure", yes_no(s->failure));
+ unit_serialize_item(u, f, "result", service_result_to_string(s->result));
+ unit_serialize_item(u, f, "reload-result", service_result_to_string(s->reload_result));
if (s->control_pid > 0)
unit_serialize_item_format(u, f, "control-pid", "%lu", (unsigned long) s->control_pid);
if (s->status_text)
unit_serialize_item(u, f, "status-text", s->status_text);
- /* There's a minor uncleanliness here: if there are multiple
- * commands attached here, we will start from the first one
- * again */
+ /* FIXME: There's a minor uncleanliness here: if there are
+ * multiple commands attached here, we will start from the
+ * first one again */
if (s->control_command_id >= 0)
unit_serialize_item(u, f, "control-command", service_exec_command_to_string(s->control_command_id));
unit_serialize_item_format(u, f, "main-exec-status-status", "%i", s->main_exec_status.status);
}
}
+ if (dual_timestamp_is_set(&s->watchdog_timestamp))
+ dual_timestamp_serialize(f, "watchdog-timestamp", &s->watchdog_timestamp);
return 0;
}
log_debug("Failed to parse state value %s", value);
else
s->deserialized_state = state;
- } else if (streq(key, "failure")) {
- int b;
+ } else if (streq(key, "result")) {
+ ServiceResult f;
+
+ f = service_result_from_string(value);
+ if (f < 0)
+ log_debug("Failed to parse result value %s", value);
+ else if (f != SERVICE_SUCCESS)
+ s->result = f;
+
+ } else if (streq(key, "reload-result")) {
+ ServiceResult f;
+
+ f = service_result_from_string(value);
+ if (f < 0)
+ log_debug("Failed to parse reload result value %s", value);
+ else if (f != SERVICE_SUCCESS)
+ s->reload_result = f;
- if ((b = parse_boolean(value)) < 0)
- log_debug("Failed to parse failure value %s", value);
- else
- s->failure = b || s->failure;
} else if (streq(key, "control-pid")) {
pid_t pid;
dual_timestamp_deserialize(value, &s->main_exec_status.start_timestamp);
else if (streq(key, "main-exec-status-exit"))
dual_timestamp_deserialize(value, &s->main_exec_status.exit_timestamp);
+ else if (streq(key, "watchdog-timestamp"))
+ dual_timestamp_deserialize(value, &s->watchdog_timestamp);
else
log_debug("Unknown serialization key '%s'", key);
service_unwatch_pid_file(s);
- service_enter_running(s, true);
+ service_enter_running(s, SERVICE_SUCCESS);
return 0;
}
return;
fail:
service_unwatch_pid_file(s);
- service_enter_signal(s, SERVICE_STOP_SIGTERM, false);
+ service_enter_signal(s, SERVICE_STOP_SIGTERM, SERVICE_FAILURE_RESOURCES);
}
static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
Service *s = SERVICE(u);
- bool success;
+ ServiceResult f;
assert(s);
assert(pid >= 0);
- if (!UNIT(s)->fragment_path)
- success = is_clean_exit_lsb(code, status);
+ if (UNIT(s)->fragment_path ? is_clean_exit(code, status) : is_clean_exit_lsb(code, status))
+ f = SERVICE_SUCCESS;
+ else if (code == CLD_EXITED)
+ f = SERVICE_FAILURE_EXIT_CODE;
+ else if (code == CLD_KILLED)
+ f = SERVICE_FAILURE_SIGNAL;
+ else if (code == CLD_DUMPED)
+ f = SERVICE_FAILURE_CORE_DUMP;
else
- success = is_clean_exit(code, status);
+ assert_not_reached("Unknown code");
if (s->main_pid == pid) {
/* Forking services may occasionally move to a new PID.
s->main_command->exec_status = s->main_exec_status;
if (s->main_command->ignore)
- success = true;
+ f = SERVICE_SUCCESS;
}
- log_full(success ? LOG_DEBUG : LOG_NOTICE,
+ log_full(f == SERVICE_SUCCESS ? LOG_DEBUG : LOG_NOTICE,
"%s: main process exited, code=%s, status=%i", u->id, sigchld_code_to_string(code), status);
- s->failure = s->failure || !success;
+
+ if (f != SERVICE_SUCCESS)
+ s->result = f;
if (s->main_command &&
s->main_command->command_next &&
- success) {
+ f == SERVICE_SUCCESS) {
/* There is another command to *
* execute, so let's do that. */
log_debug("%s running next main command for state %s", u->id, service_state_to_string(s->state));
- service_run_next_main(s, success);
+ service_run_next_main(s);
} else {
case SERVICE_START:
if (s->type == SERVICE_ONESHOT) {
/* This was our main goal, so let's go on */
- if (success)
+ if (f == SERVICE_SUCCESS)
service_enter_start_post(s);
else
- service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
+ service_enter_signal(s, SERVICE_FINAL_SIGTERM, f);
break;
} else {
assert(s->type == SERVICE_DBUS || s->type == SERVICE_NOTIFY);
}
case SERVICE_RUNNING:
- service_enter_running(s, success);
+ service_enter_running(s, f);
break;
case SERVICE_STOP_SIGTERM:
case SERVICE_STOP_SIGKILL:
if (!control_pid_good(s))
- service_enter_stop_post(s, success);
+ service_enter_stop_post(s, f);
/* If there is still a control process, wait for that first */
break;
exec_status_exit(&s->control_command->exec_status, &s->exec_context, pid, code, status);
if (s->control_command->ignore)
- success = true;
+ f = SERVICE_SUCCESS;
}
- log_full(success ? LOG_DEBUG : LOG_NOTICE,
+ log_full(f == SERVICE_SUCCESS ? LOG_DEBUG : LOG_NOTICE,
"%s: control process exited, code=%s status=%i", u->id, sigchld_code_to_string(code), status);
- s->failure = s->failure || !success;
+
+ if (f != SERVICE_SUCCESS)
+ s->result = f;
if (s->control_command &&
s->control_command->command_next &&
- success) {
+ f == SERVICE_SUCCESS) {
/* There is another command to *
* execute, so let's do that. */
log_debug("%s running next control command for state %s", u->id, service_state_to_string(s->state));
- service_run_next_control(s, success);
+ service_run_next_control(s);
} else {
/* No further commands for this step, so let's
switch (s->state) {
case SERVICE_START_PRE:
- if (success)
+ if (f == SERVICE_SUCCESS)
service_enter_start(s);
else
- service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
+ service_enter_signal(s, SERVICE_FINAL_SIGTERM, f);
break;
case SERVICE_START:
assert(s->type == SERVICE_FORKING);
- if (!success) {
- service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
+ if (f != SERVICE_SUCCESS) {
+ service_enter_signal(s, SERVICE_FINAL_SIGTERM, f);
break;
}
if (s->pid_file) {
+ bool has_start_post;
+ int r;
+
/* Let's try to load the pid file here if we can.
* The PID file might actually be created by a START_POST
* script. In that case don't worry if the loading fails. */
- bool has_start_post = !!s->exec_command[SERVICE_EXEC_START_POST];
- int r = service_load_pid_file(s, !has_start_post);
+
+ has_start_post = !!s->exec_command[SERVICE_EXEC_START_POST];
+ r = service_load_pid_file(s, !has_start_post);
if (!has_start_post && r < 0) {
r = service_demand_pid_file(s);
if (r < 0 || !cgroup_good(s))
- service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
+ service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_FAILURE_RESOURCES);
break;
}
} else
break;
case SERVICE_START_POST:
- if (!success) {
- service_enter_stop(s, false);
+ if (f != SERVICE_SUCCESS) {
+ service_enter_stop(s, f);
break;
}
if (s->pid_file) {
- int r = service_load_pid_file(s, true);
+ int r;
+
+ r = service_load_pid_file(s, true);
if (r < 0) {
r = service_demand_pid_file(s);
if (r < 0 || !cgroup_good(s))
- service_enter_stop(s, false);
+ service_enter_stop(s, SERVICE_FAILURE_RESOURCES);
break;
}
} else
service_search_main_pid(s);
- service_enter_running(s, true);
+ service_enter_running(s, SERVICE_SUCCESS);
break;
case SERVICE_RELOAD:
- if (success) {
+ if (f == SERVICE_SUCCESS) {
service_load_pid_file(s, true);
service_search_main_pid(s);
}
- s->reload_failure = !success;
- service_enter_running(s, true);
+ s->reload_result = f;
+ service_enter_running(s, SERVICE_SUCCESS);
break;
case SERVICE_STOP:
- service_enter_signal(s, SERVICE_STOP_SIGTERM, success);
+ service_enter_signal(s, SERVICE_STOP_SIGTERM, f);
break;
case SERVICE_STOP_SIGTERM:
case SERVICE_STOP_SIGKILL:
if (main_pid_good(s) <= 0)
- service_enter_stop_post(s, success);
+ service_enter_stop_post(s, f);
/* If there is still a service
* process around, wait until
case SERVICE_STOP_POST:
case SERVICE_FINAL_SIGTERM:
case SERVICE_FINAL_SIGKILL:
- service_enter_dead(s, success, true);
+ service_enter_dead(s, f, true);
break;
default:
assert(s);
assert(elapsed == 1);
+ if (w == &s->watchdog_watch) {
+ service_handle_watchdog(s);
+ return;
+ }
+
assert(w == &s->timer_watch);
switch (s->state) {
case SERVICE_START_PRE:
case SERVICE_START:
log_warning("%s operation timed out. Terminating.", u->id);
- service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
+ service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_FAILURE_TIMEOUT);
break;
case SERVICE_START_POST:
log_warning("%s operation timed out. Stopping.", u->id);
- service_enter_stop(s, false);
+ service_enter_stop(s, SERVICE_FAILURE_TIMEOUT);
break;
case SERVICE_RELOAD:
log_warning("%s operation timed out. Stopping.", u->id);
- s->reload_failure = true;
- service_enter_running(s, true);
+ s->reload_result = SERVICE_FAILURE_TIMEOUT;
+ service_enter_running(s, SERVICE_SUCCESS);
break;
case SERVICE_STOP:
log_warning("%s stopping timed out. Terminating.", u->id);
- service_enter_signal(s, SERVICE_STOP_SIGTERM, false);
+ service_enter_signal(s, SERVICE_STOP_SIGTERM, SERVICE_FAILURE_TIMEOUT);
break;
case SERVICE_STOP_SIGTERM:
if (s->exec_context.send_sigkill) {
log_warning("%s stopping timed out. Killing.", u->id);
- service_enter_signal(s, SERVICE_STOP_SIGKILL, false);
+ service_enter_signal(s, SERVICE_STOP_SIGKILL, SERVICE_FAILURE_TIMEOUT);
} else {
log_warning("%s stopping timed out. Skipping SIGKILL.", u->id);
- service_enter_stop_post(s, false);
+ service_enter_stop_post(s, SERVICE_FAILURE_TIMEOUT);
}
break;
* weirded out and continue */
log_warning("%s still around after SIGKILL. Ignoring.", u->id);
- service_enter_stop_post(s, false);
+ service_enter_stop_post(s, SERVICE_FAILURE_TIMEOUT);
break;
case SERVICE_STOP_POST:
log_warning("%s stopping timed out (2). Terminating.", u->id);
- service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
+ service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_FAILURE_TIMEOUT);
break;
case SERVICE_FINAL_SIGTERM:
if (s->exec_context.send_sigkill) {
log_warning("%s stopping timed out (2). Killing.", u->id);
- service_enter_signal(s, SERVICE_FINAL_SIGKILL, false);
+ service_enter_signal(s, SERVICE_FINAL_SIGKILL, SERVICE_FAILURE_TIMEOUT);
} else {
log_warning("%s stopping timed out (2). Skipping SIGKILL. Entering failed mode.", u->id);
- service_enter_dead(s, false, true);
+ service_enter_dead(s, SERVICE_FAILURE_TIMEOUT, false);
}
break;
case SERVICE_FINAL_SIGKILL:
log_warning("%s still around after SIGKILL (2). Entering failed mode.", u->id);
- service_enter_dead(s, false, true);
+ service_enter_dead(s, SERVICE_FAILURE_TIMEOUT, true);
break;
case SERVICE_AUTO_RESTART:
log_warning("%s never wrote its PID file. Failing.", UNIT(s)->id);
service_unwatch_pid_file(s);
if (s->state == SERVICE_START)
- service_enter_signal(s, SERVICE_FINAL_SIGTERM, false);
+ service_enter_signal(s, SERVICE_FINAL_SIGTERM, SERVICE_FAILURE_RESOURCES);
else
- service_enter_stop(s, false);
+ service_enter_stop(s, SERVICE_FAILURE_RESOURCES);
}
break;
case SERVICE_RUNNING:
- service_enter_running(s, true);
+ /* service_enter_running() will figure out what to do */
+ service_enter_running(s, SERVICE_SUCCESS);
break;
case SERVICE_STOP_SIGTERM:
case SERVICE_STOP_SIGKILL:
if (main_pid_good(s) <= 0 && !control_pid_good(s))
- service_enter_stop_post(s, true);
+ service_enter_stop_post(s, SERVICE_SUCCESS);
break;
case SERVICE_FINAL_SIGTERM:
case SERVICE_FINAL_SIGKILL:
if (main_pid_good(s) <= 0 && !control_pid_good(s))
- service_enter_dead(s, true, true);
+ service_enter_dead(s, SERVICE_SUCCESS, SERVICE_SUCCESS);
break;
}
}
+ if (strv_find(tags, "WATCHDOG=1")) {
+ log_debug("%s: got WATCHDOG=1", u->id);
+ service_reset_watchdog(s);
+ }
/* Notify clients about changed status or main pid */
unit_add_to_dbus_queue(u);
/* service_enter_running() will figure out what to
* do */
if (s->state == SERVICE_RUNNING)
- service_enter_running(s, true);
+ service_enter_running(s, SERVICE_SUCCESS);
else if (s->state == SERVICE_START && new_owner)
service_enter_start_post(s);
if (s->state == SERVICE_FAILED)
service_set_state(s, SERVICE_DEAD);
- s->failure = false;
+ s->result = SERVICE_SUCCESS;
+ s->reload_result = SERVICE_SUCCESS;
}
static bool service_need_daemon_reload(Unit *u) {
DEFINE_STRING_TABLE_LOOKUP(notify_access, NotifyAccess);
+static const char* const service_result_table[_SERVICE_RESULT_MAX] = {
+ [SERVICE_SUCCESS] = "success",
+ [SERVICE_FAILURE_RESOURCES] = "resources",
+ [SERVICE_FAILURE_TIMEOUT] = "timeout",
+ [SERVICE_FAILURE_EXIT_CODE] = "exit-code",
+ [SERVICE_FAILURE_SIGNAL] = "signal",
+ [SERVICE_FAILURE_CORE_DUMP] = "core-dump",
+ [SERVICE_FAILURE_WATCHDOG] = "watchdog"
+};
+
+DEFINE_STRING_TABLE_LOOKUP(service_result, ServiceResult);
+
const UnitVTable service_vtable = {
.suffix = ".service",
.object_size = sizeof(Service),
~ianmdlvl / elogind.git / blobdiff