]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
service: timeout on SIGABRT should also be considered an error to remember
authorLennart Poettering <lennart@poettering.net>
Tue, 21 Apr 2015 00:20:15 +0000 (02:20 +0200)
committerLennart Poettering <lennart@poettering.net>
Tue, 21 Apr 2015 00:20:15 +0000 (02:20 +0200)
src/core/service.c

index f8370cfc16ccd4e9a0369486da06dd518238f284..083c2eb4440a697c90a38b66c8a7432d97a99749 100644 (file)
@@ -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: