diff options
| author | Lennart Poettering <lennart@poettering.net> | 2017-04-29 18:40:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-29 18:40:19 +0200 |
| commit | db7076bf78bd8e466ae927b6d3ddf64190c8d299 (patch) | |
| tree | 58b5135da7e2b28b525e7b532644576bae750927 /src/core/unit.c | |
| parent | 007f09d487da7f8e136cd1346feee2dcba28be61 (diff) | |
| parent | d9732d78034cd01a75f2cda6ebaddb4c3a0929ea (diff) | |
Merge pull request #5164 from Werkov/ordering-for-_netdev-devices
Ordering for _netdev devices
Diffstat (limited to 'src/core/unit.c')
| -rw-r--r-- | src/core/unit.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/core/unit.c b/src/core/unit.c index 25ea5a8591..01fa0d0d46 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -99,6 +99,7 @@ Unit *unit_new(Manager *m, size_t size) { u->on_failure_job_mode = JOB_REPLACE; u->cgroup_inotify_wd = -1; u->job_timeout = USEC_INFINITY; + u->job_running_timeout = USEC_INFINITY; u->ref_uid = UID_INVALID; u->ref_gid = GID_INVALID; u->cpu_usage_last = NSEC_INFINITY; @@ -1336,6 +1337,9 @@ int unit_load(Unit *u) { goto fail; } + if (u->job_running_timeout != USEC_INFINITY && u->job_running_timeout > u->job_timeout) + log_unit_warning(u, "JobRunningTimeoutSec= is greater than JobTimeoutSec=, it has no effect."); + unit_update_cgroup_members_masks(u); } |