projects
/
platform
/
upstream
/
systemd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a00973a
)
service: timeout on SIGABRT should also be considered an error to remember
author
Lennart Poettering
<lennart@poettering.net>
Tue, 21 Apr 2015 00:20:15 +0000
(
02:20
+0200)
committer
Lennart Poettering
<lennart@poettering.net>
Tue, 21 Apr 2015 00:20:15 +0000
(
02:20
+0200)
src/core/service.c
patch
|
blob
|
history
diff --git
a/src/core/service.c
b/src/core/service.c
index
f8370cf
..
083c2eb
100644
(file)
--- a/
src/core/service.c
+++ b/
src/core/service.c
@@
-2694,9
+2694,8
@@
static int service_dispatch_timer(sd_event_source *source, usec_t usec, void *us
break;
case SERVICE_STOP_SIGABRT:
- log_unit_warning(UNIT(s)->id,
- "%s stop-sigabrt timed out. Terminating.", UNIT(s)->id);
- service_enter_signal(s, SERVICE_STOP_SIGTERM, s->result);
+ log_unit_warning(UNIT(s)->id, "%s stop-sigabrt timed out. Terminating.", UNIT(s)->id);
+ service_enter_signal(s, SERVICE_STOP_SIGTERM, SERVICE_FAILURE_TIMEOUT);
break;
case SERVICE_STOP_SIGTERM: