diff options
| author | Michal Sekletar <msekleta@redhat.com> | 2012-08-07 14:41:48 +0200 |
|---|---|---|
| committer | Michal Schmidt <mschmidt@redhat.com> | 2012-08-08 18:11:09 +0200 |
| commit | d568a3350ee8a45877eef87cd026a954124e2cf8 (patch) | |
| tree | 067004e51637638797966799237a8135202474a4 /man/systemd.service.xml | |
| parent | 7781e063e8e9d3e92e4e158e1588b885808cda24 (diff) | |
systemd: introduced new timeout types
Makes possible to specify separate timeout for start and stop of
the service.
[ Improved the manpage. Coding style fix. -- michich ]
Diffstat (limited to 'man/systemd.service.xml')
| -rw-r--r-- | man/systemd.service.xml | 46 |
1 files changed, 34 insertions, 12 deletions
diff --git a/man/systemd.service.xml b/man/systemd.service.xml index f43201dc7e..1946d85f48 100644 --- a/man/systemd.service.xml +++ b/man/systemd.service.xml @@ -463,27 +463,49 @@ </varlistentry> <varlistentry> - <term><varname>TimeoutSec=</varname></term> + <term><varname>TimeoutStartSec=</varname></term> <listitem><para>Configures the time to - wait for start-up and stop. If a + wait for start-up. If a daemon service does not signal start-up completion within the - configured time the service will be + configured time, the service will be considered failed and be shut down - again. If a service is asked to stop - but does not terminate in the - specified time it will be terminated + again. + Takes a unit-less value in seconds, or a + time span value such as "5min + 20s". Pass 0 to disable the timeout + logic. Defaults to 90s, except when + <varname>Type=oneshot</varname> is + used in which case the timeout + is disabled by default. + </para></listitem> + </varlistentry> + + <varlistentry> + <term><varname>TimeoutStopSec=</varname></term> + <listitem><para>Configures the time to + wait for stop. If a service is asked + to stop but does not terminate in the + specified time, it will be terminated forcibly via SIGTERM, and after another delay of this time with - SIGKILL. (See + SIGKILL (See <varname>KillMode=</varname> - in <citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>) Takes a unit-less value in seconds, or a + in <citerefentry><refentrytitle>systemd.kill</refentrytitle><manvolnum>5</manvolnum></citerefentry>). + Takes a unit-less value in seconds, or a time span value such as "5min 20s". Pass 0 to disable the timeout - logic. Defaults to - 90s, except when <varname>Type=oneshot</varname> is - used in which case the timeout - is disabled by default.</para></listitem> + logic. Defaults to 90s. + </para></listitem> + </varlistentry> + + <varlistentry> + <term><varname>TimeoutSec=</varname></term> + <listitem><para>A shorthand for configuring + both <varname>TimeoutStartSec=</varname> + and <varname>TimeoutStopSec=</varname> + to the specified value. + </para></listitem> </varlistentry> <varlistentry> |