summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-04-21 02:20:15 +0200
committerLennart Poettering <lennart@poettering.net>2015-04-21 02:20:15 +0200
commit2ab2ab7b19de7b4e1ef977a6c056ce0b525c198a (patch)
treea6463e23afe777aba5c0d469bb1f46fb5fb6ec72
parenta00973af276f6e861aaf84cf4cae824223597b7f (diff)
service: timeout on SIGABRT should also be considered an error to remember
-rw-r--r--src/core/service.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/core/service.c b/src/core/service.c
index f8370cfc16..083c2eb444 100644
--- 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: