chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix possible lack of status messages on shutdown/reboot
[elogind.git]
/
src
/
core
/
service.c
diff --git
a/src/core/service.c
b/src/core/service.c
index ce757570219d5201df63d1a2850b809eb785b282..3da32a162172166ec3d64aac0985e81d734d283e 100644
(file)
--- a/
src/core/service.c
+++ b/
src/core/service.c
@@
-124,9
+124,9
@@
static void service_init(Unit *u) {
assert(u);
assert(u->load_state == UNIT_STUB);
assert(u);
assert(u->load_state == UNIT_STUB);
- s->timeout_start_usec =
DEFAULT_TIMEOUT_USEC
;
- s->timeout_stop_usec =
DEFAULT_TIMEOUT_USEC
;
- s->restart_usec =
DEFAULT_RESTART_USEC
;
+ s->timeout_start_usec =
u->manager->default_timeout_start_usec
;
+ s->timeout_stop_usec =
u->manager->default_timeout_stop_usec
;
+ s->restart_usec =
u->manager->default_restart_usec
;
s->type = _SERVICE_TYPE_INVALID;
watch_init(&s->watchdog_watch);
s->type = _SERVICE_TYPE_INVALID;
watch_init(&s->watchdog_watch);
@@
-143,7
+143,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, 10*USEC_PER_SEC, 5);
+ 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;
}