From f189ab18de69d3dee81117d7925fb370cd038f0f Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 28 Oct 2014 01:49:07 +0100 Subject: job: optionally, when a job timeout is hit, also execute a failure action --- src/core/job.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/core/job.c') diff --git a/src/core/job.c b/src/core/job.c index ef5dbce1a3..aa205ba781 100644 --- a/src/core/job.c +++ b/src/core/job.c @@ -858,14 +858,18 @@ finish: static int job_dispatch_timer(sd_event_source *s, uint64_t monotonic, void *userdata) { Job *j = userdata; + Unit *u; assert(j); assert(s == j->timer_event_source); - log_warning_unit(j->unit->id, "Job %s/%s timed out.", - j->unit->id, job_type_to_string(j->type)); + log_warning_unit(j->unit->id, "Job %s/%s timed out.", j->unit->id, job_type_to_string(j->type)); + u = j->unit; job_finish_and_invalidate(j, JOB_TIMEOUT, true); + + failure_action(u->manager, u->job_timeout_action, u->job_timeout_reboot_arg); + return 0; } -- cgit v1.2.3-54-g00ecf