chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
util: replace close_nointr_nofail() by a more useful safe_close()
[elogind.git]
/
src
/
core
/
service.c
diff --git
a/src/core/service.c
b/src/core/service.c
index d8e88ea2f0960e0a08961844d7e2ea450eec628a..fe7ddd1841041706a0845dd1d03ad5aa50561656 100644
(file)
--- a/
src/core/service.c
+++ b/
src/core/service.c
@@
-147,9
+147,9
@@
static void service_init(Unit *u) {
kill_context_init(&s->kill_context);
cgroup_context_init(&s->cgroup_context);
kill_context_init(&s->kill_context);
cgroup_context_init(&s->cgroup_context);
- RATELIMIT_INIT(s->start_limit,
- u->manager->default_start_limit_interval,
-
u->manager->default_start_limit_burst);
+ unit_cgroup_context_init_defaults(u, &s->cgroup_context);
+
+
RATELIMIT_INIT(s->start_limit, u->manager->default_start_limit_interval,
u->manager->default_start_limit_burst);
s->control_command_id = _SERVICE_EXEC_COMMAND_INVALID;
}
s->control_command_id = _SERVICE_EXEC_COMMAND_INVALID;
}
@@
-226,8
+226,7
@@
static void service_close_socket_fd(Service *s) {
if (s->socket_fd < 0)
return;
if (s->socket_fd < 0)
return;
- close_nointr_nofail(s->socket_fd);
- s->socket_fd = -1;
+ s->socket_fd = safe_close(s->socket_fd);
}
static void service_connection_unref(Service *s) {
}
static void service_connection_unref(Service *s) {
@@
-361,7
+360,7
@@
static int service_arm_timer(Service *s, usec_t usec) {
static char *sysv_translate_name(const char *name) {
char *r;
static char *sysv_translate_name(const char *name) {
char *r;
- r = new(char, strlen(name) + s
izeof(".service")
);
+ r = new(char, strlen(name) + s
trlen(".service") + 1
);
if (!r)
return NULL;
if (!r)
return NULL;
@@
-1235,7
+1234,7
@@
static int service_load(Unit *u) {
return r;
}
return r;
}
- r = unit_exec_context_defaults(u, &s->exec_context);
+ r = unit_exec_context_
patch_
defaults(u, &s->exec_context);
if (r < 0)
return r;
}
if (r < 0)
return r;
}
@@
-1436,9
+1435,7
@@
static int service_search_main_pid(Service *s) {
log_warning_unit(UNIT(s)->id,
"Failed to watch PID "PID_FMT" from service %s",
pid, UNIT(s)->id);
log_warning_unit(UNIT(s)->id,
"Failed to watch PID "PID_FMT" from service %s",
pid, UNIT(s)->id);
- return r;
-
- return 0;
+ return r;
}
static void service_set_state(Service *s, ServiceState state) {
}
static void service_set_state(Service *s, ServiceState state) {
@@
-1772,6
+1769,7
@@
static int service_spawn(
UNIT(s)->manager->confirm_spawn,
UNIT(s)->manager->cgroup_supported,
path,
UNIT(s)->manager->confirm_spawn,
UNIT(s)->manager->cgroup_supported,
path,
+ manager_get_runtime_prefix(UNIT(s)->manager),
UNIT(s)->id,
s->watchdog_usec,
s->type == SERVICE_IDLE ? UNIT(s)->manager->idle_pipe : NULL,
UNIT(s)->id,
s->watchdog_usec,
s->type == SERVICE_IDLE ? UNIT(s)->manager->idle_pipe : NULL,
@@
-1873,10
+1871,13
@@
static void service_enter_dead(Service *s, ServiceResult f, bool allow_restart)
s->forbid_restart = false;
s->forbid_restart = false;
- /*
w
e want fresh tmpdirs in case service is started again immediately */
+ /*
W
e want fresh tmpdirs in case service is started again immediately */
exec_runtime_destroy(s->exec_runtime);
s->exec_runtime = exec_runtime_unref(s->exec_runtime);
exec_runtime_destroy(s->exec_runtime);
s->exec_runtime = exec_runtime_unref(s->exec_runtime);
+ /* Also, remove the runtime directory in */
+ exec_context_destroy_runtime_directory(&s->exec_context, manager_get_runtime_prefix(UNIT(s)->manager));
+
/* Try to delete the pid file. At this point it will be
* out-of-date, and some software might be confused by it, so
* let's remove it. */
/* Try to delete the pid file. At this point it will be
* out-of-date, and some software might be confused by it, so
* let's remove it. */
@@
-2682,8
+2683,7
@@
static int service_deserialize_item(Unit *u, const char *key, const char *value,
log_debug_unit(u->id, "Failed to parse socket-fd value %s", value);
else {
log_debug_unit(u->id, "Failed to parse socket-fd value %s", value);
else {
- if (s->socket_fd >= 0)
- close_nointr_nofail(s->socket_fd);
+ safe_close(s->socket_fd);
s->socket_fd = fdset_remove(fds, fd);
}
} else if (streq(key, "main-exec-status-pid")) {
s->socket_fd = fdset_remove(fds, fd);
}
} else if (streq(key, "main-exec-status-pid")) {
@@
-3308,7
+3308,10
@@
static int service_dispatch_timer(sd_event_source *source, usec_t usec, void *us
case SERVICE_AUTO_RESTART:
log_info_unit(UNIT(s)->id,
case SERVICE_AUTO_RESTART:
log_info_unit(UNIT(s)->id,
- "%s holdoff time over, scheduling restart.", UNIT(s)->id);
+ s->restart_usec > 0 ?
+ "%s holdoff time over, scheduling restart." :
+ "%s has no holdoff time, scheduling restart.",
+ UNIT(s)->id);
service_enter_restart(s);
break;
service_enter_restart(s);
break;
@@
-3411,7
+3414,7
@@
static void service_notify_message(Unit *u, pid_t pid, char **tags) {
free(t);
}
free(t);
}
- /* Interpet WATCHDOG= */
+ /* Interp
r
et WATCHDOG= */
if (strv_find(tags, "WATCHDOG=1")) {
log_debug_unit(u->id, "%s: got WATCHDOG=1", u->id);
service_reset_watchdog(s);
if (strv_find(tags, "WATCHDOG=1")) {
log_debug_unit(u->id, "%s: got WATCHDOG=1", u->id);
service_reset_watchdog(s);