diff options
| author | Daniel Mack <github@zonque.org> | 2016-02-02 17:32:31 +0100 |
|---|---|---|
| committer | Daniel Mack <github@zonque.org> | 2016-02-02 17:32:31 +0100 |
| commit | 14ddf4207ffece3b0843bd1250a64c41c32ac9ae (patch) | |
| tree | 4f6863c989de0b55f7305464c154011578e72cc6 /src/core/job.c | |
| parent | b72190e90f0846956e609075fb9113dba9bc8f0f (diff) | |
| parent | 2c29d3324dbcab7720cc6bb5852b1a01daa6772c (diff) | |
Merge pull request #2506 from poettering/resolved-and-more
pid 1 fixes, resolved fixes, and more
Diffstat (limited to 'src/core/job.c')
| -rw-r--r-- | src/core/job.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/core/job.c b/src/core/job.c index d8fdf1b53f..1dcb872019 100644 --- a/src/core/job.c +++ b/src/core/job.c @@ -932,14 +932,14 @@ int job_start_timer(Job *j) { j->begin_usec = now(CLOCK_MONOTONIC); - if (j->unit->job_timeout <= 0) + if (j->unit->job_timeout == USEC_INFINITY) return 0; r = sd_event_add_time( j->manager->event, &j->timer_event_source, CLOCK_MONOTONIC, - j->begin_usec + j->unit->job_timeout, 0, + usec_add(j->begin_usec, j->unit->job_timeout), 0, job_dispatch_timer, j); if (r < 0) return r; @@ -1117,17 +1117,16 @@ int job_coldplug(Job *j) { if (j->state == JOB_WAITING) job_add_to_run_queue(j); - if (j->begin_usec == 0 || j->unit->job_timeout == 0) + if (j->begin_usec == 0 || j->unit->job_timeout == USEC_INFINITY) return 0; - if (j->timer_event_source) - j->timer_event_source = sd_event_source_unref(j->timer_event_source); + j->timer_event_source = sd_event_source_unref(j->timer_event_source); r = sd_event_add_time( j->manager->event, &j->timer_event_source, CLOCK_MONOTONIC, - j->begin_usec + j->unit->job_timeout, 0, + usec_add(j->begin_usec, j->unit->job_timeout), 0, job_dispatch_timer, j); if (r < 0) log_debug_errno(r, "Failed to restart timeout for job: %m"); |