diff options
author | Lennart Poettering <lennart@poettering.net> | 2016-04-26 20:34:33 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2016-04-29 16:27:48 +0200 |
commit | 7629ec4642b03517742d09b7303c204fddf82108 (patch) | |
tree | 91b9cbfaa378ea199ff1f5e887a863e21243d548 /man | |
parent | 8b26cdbd2a949b02c0f4d94d0e157cdb9438d246 (diff) |
core: move start ratelimiting check after condition checks
With #2564 unit start rate limiting was moved from after the condition checks
are to before they are made, in an attempt to fix #2467. This however resulted
in #2684. However, with a previous commit a concept of per socket unit trigger
rate limiting has been added, to fix #2467 more comprehensively, hence the
start limit can be moved after the condition checks again, thus fixing #2684.
Fixes: #2684
Diffstat (limited to 'man')
-rw-r--r-- | man/systemd.unit.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml index 7993301167..9c869b9805 100644 --- a/man/systemd.unit.xml +++ b/man/systemd.unit.xml @@ -769,7 +769,8 @@ manually at a later point, from which point on, the restart logic is again activated. Note that <command>systemctl reset-failed</command> will cause the restart rate counter for a service to be flushed, which is useful if the administrator wants to manually start a unit and the start limit interferes with - that.</para></listitem> + that. Note that this rate-limiting is enforced after any unit condition checks are executed, and hence unit + activations with failing conditions are not counted by this rate limiting.</para></listitem> </varlistentry> <varlistentry> |