mirror of
https://github.com/systemd/systemd
synced 2024-09-06 16:56:43 +00:00
core: rename StartLimitInterval= to StartLimitIntervalSec=
We generally follow the rule that for time settings we suffix the setting name with "Sec" to indicate the default unit if none is specified. The only exception was the rate limiting interval settings. Fix this, and keep the old names for compatibility. Do the same for journald's RateLimitInterval= setting
This commit is contained in:
parent
7629ec4642
commit
f0367da7d1
|
@ -53,7 +53,7 @@ Documentation: man:journald.conf(5)
|
||||||
Паведамленні іншых сэрвісаў засталіся.
|
Паведамленні іншых сэрвісаў засталіся.
|
||||||
|
|
||||||
Мяжа, пасля якой паведамленні будуць адкінуты, наладжваецца з
|
Мяжа, пасля якой паведамленні будуць адкінуты, наладжваецца з
|
||||||
дапамогай RateLimitInterval= і RateLimitBurst= у файле
|
дапамогай RateLimitIntervalSec= і RateLimitBurst= у файле
|
||||||
/etc/systemd/journald.conf. Глядзіце journald.conf(5) для дэталей.
|
/etc/systemd/journald.conf. Глядзіце journald.conf(5) для дэталей.
|
||||||
|
|
||||||
-- e9bf28e6e834481bb6f48f548ad13606
|
-- e9bf28e6e834481bb6f48f548ad13606
|
||||||
|
|
|
@ -53,7 +53,7 @@ Majcie na ŭvazie, što byli adkinuty paviedamliennia toĺki hetaha servisu.
|
||||||
Paviedamlienni inšych servisaŭ zastalisia.
|
Paviedamlienni inšych servisaŭ zastalisia.
|
||||||
|
|
||||||
Miaža, paslia jakoj paviedamlienni buduć adkinuty, naladžvajecca z
|
Miaža, paslia jakoj paviedamlienni buduć adkinuty, naladžvajecca z
|
||||||
dapamohaj RateLimitInterval= i RateLimitBurst= u fajlie
|
dapamohaj RateLimitIntervalSec= i RateLimitBurst= u fajlie
|
||||||
/etc/systemd/journald.conf. Hliadzicie journald.conf(5) dlia detaliej.
|
/etc/systemd/journald.conf. Hliadzicie journald.conf(5) dlia detaliej.
|
||||||
|
|
||||||
-- e9bf28e6e834481bb6f48f548ad13606
|
-- e9bf28e6e834481bb6f48f548ad13606
|
||||||
|
|
|
@ -66,7 +66,7 @@ Note that only messages from the service in question have been
|
||||||
dropped, other services' messages are unaffected.
|
dropped, other services' messages are unaffected.
|
||||||
|
|
||||||
The limits controlling when messages are dropped may be configured
|
The limits controlling when messages are dropped may be configured
|
||||||
with RateLimitInterval= and RateLimitBurst= in
|
with RateLimitIntervalSec= and RateLimitBurst= in
|
||||||
/etc/systemd/journald.conf. See journald.conf(5) for details.
|
/etc/systemd/journald.conf. See journald.conf(5) for details.
|
||||||
|
|
||||||
-- e9bf28e6e834481bb6f48f548ad13606
|
-- e9bf28e6e834481bb6f48f548ad13606
|
||||||
|
|
|
@ -52,7 +52,7 @@ Kun beskeder fra omtalte service er smidt væk. Beskeder fra andre
|
||||||
services er ikke påvirket.
|
services er ikke påvirket.
|
||||||
|
|
||||||
Grænsen for hvornår beskeder bliver smidt væk kan konfigureres
|
Grænsen for hvornår beskeder bliver smidt væk kan konfigureres
|
||||||
med RateLimitInterval= og RateLimitBurst= i
|
med RateLimitIntervalSec= og RateLimitBurst= i
|
||||||
/etc/systemd/journald.conf. Se journald.conf(5) for detaljer herom.
|
/etc/systemd/journald.conf. Se journald.conf(5) for detaljer herom.
|
||||||
|
|
||||||
-- e9bf28e6e834481bb6f48f548ad13606
|
-- e9bf28e6e834481bb6f48f548ad13606
|
||||||
|
|
|
@ -51,7 +51,7 @@ Notez que seuls des messages de ce service ont été évincés, les messages des
|
||||||
autres services ne sont pas affectés.
|
autres services ne sont pas affectés.
|
||||||
|
|
||||||
Les limites définissant ce comportement peuvent être configurées avec les
|
Les limites définissant ce comportement peuvent être configurées avec les
|
||||||
paramètres RateLimitInterval= et RateLimitBurst= dans le fichier
|
paramètres RateLimitIntervalSec= et RateLimitBurst= dans le fichier
|
||||||
/etc/systemd/journald.conf. Voir journald.conf(5) pour plus de détails.
|
/etc/systemd/journald.conf. Voir journald.conf(5) pour plus de détails.
|
||||||
|
|
||||||
-- e9bf28e6e834481bb6f48f548ad13606
|
-- e9bf28e6e834481bb6f48f548ad13606
|
||||||
|
|
|
@ -51,7 +51,7 @@ Ne feledje, hogy csak a kérdéses szolgáltatás üzenetei kerültek eldobásra
|
||||||
más szolgáltatások üzeneteit ez nem befolyásolja.
|
más szolgáltatások üzeneteit ez nem befolyásolja.
|
||||||
|
|
||||||
Az üzenetek eldobását vezérlő korlátok az /etc/systemd/journald.conf
|
Az üzenetek eldobását vezérlő korlátok az /etc/systemd/journald.conf
|
||||||
RateLimitInterval= és RateLimitBurst= beállításaival adhatók meg.
|
RateLimitIntervalSec= és RateLimitBurst= beállításaival adhatók meg.
|
||||||
Részletekért lásd a journald.conf(5) man oldalt.
|
Részletekért lásd a journald.conf(5) man oldalt.
|
||||||
|
|
||||||
-- e9bf28e6e834481bb6f48f548ad13606
|
-- e9bf28e6e834481bb6f48f548ad13606
|
||||||
|
|
|
@ -46,7 +46,7 @@ Solo i messaggi del servizio indicato sono stati
|
||||||
eliminati, i messaggi degli altri servizi rimangono invariati.
|
eliminati, i messaggi degli altri servizi rimangono invariati.
|
||||||
|
|
||||||
I limiti oltre i quali i messaggi si eliminano si configurano
|
I limiti oltre i quali i messaggi si eliminano si configurano
|
||||||
con RateLimitInterval= e RateLimitBurst= in
|
con RateLimitIntervalSec= e RateLimitBurst= in
|
||||||
/etc/systemd/journald.conf. Vedi journald.conf(5) per maggiori informazioni.
|
/etc/systemd/journald.conf. Vedi journald.conf(5) per maggiori informazioni.
|
||||||
|
|
||||||
-- e9bf28e6e834481bb6f48f548ad13606
|
-- e9bf28e6e834481bb6f48f548ad13606
|
||||||
|
|
|
@ -55,7 +55,7 @@ Documentation: man:journald.conf(5)
|
||||||
다른 서비스의 메시지에는 영향을 주지 않습니다.
|
다른 서비스의 메시지에는 영향을 주지 않습니다.
|
||||||
|
|
||||||
메시지 거절 제어 제한 값은 /etc/systemd/journald.conf 의
|
메시지 거절 제어 제한 값은 /etc/systemd/journald.conf 의
|
||||||
RateLimitInterval= 변수와 RateLimitBurst= 변수로 설정합니다.
|
RateLimitIntervalSec= 변수와 RateLimitBurst= 변수로 설정합니다.
|
||||||
자세한 내용은 ournald.conf(5)를 살펴보십시오.
|
자세한 내용은 ournald.conf(5)를 살펴보십시오.
|
||||||
|
|
||||||
-- e9bf28e6e834481bb6f48f548ad13606
|
-- e9bf28e6e834481bb6f48f548ad13606
|
||||||
|
|
|
@ -69,7 +69,7 @@ Proszę zauważyć, że tylko komunikaty z danej usługi zostały pominięte. Ni
|
||||||
to wpływu na komunikaty innych usług.
|
to wpływu na komunikaty innych usług.
|
||||||
|
|
||||||
Ograniczenia kontrolujące pomijanie komunikatów mogą być konfigurowane
|
Ograniczenia kontrolujące pomijanie komunikatów mogą być konfigurowane
|
||||||
za pomocą opcji RateLimitInterval= i RateLimitBurst= w pliku
|
za pomocą opcji RateLimitIntervalSec= i RateLimitBurst= w pliku
|
||||||
/etc/systemd/journald.conf. Strona journald.conf(5) zawiera więcej informacji.
|
/etc/systemd/journald.conf. Strona journald.conf(5) zawiera więcej informacji.
|
||||||
|
|
||||||
-- e9bf28e6e834481bb6f48f548ad13606
|
-- e9bf28e6e834481bb6f48f548ad13606
|
||||||
|
|
|
@ -53,7 +53,7 @@ Note que apenas mensagens de um serviço em questão foram descartadas; outras
|
||||||
mensagens dos serviços não foram afetadas.
|
mensagens dos serviços não foram afetadas.
|
||||||
|
|
||||||
Os controles de limites de quando as mensagens são descartadas pode ser
|
Os controles de limites de quando as mensagens são descartadas pode ser
|
||||||
configurado com RateLimitInterval= e RateLimitBurst= no
|
configurado com RateLimitIntervalSec= e RateLimitBurst= no
|
||||||
/etc/systemd/journald.conf. Veja journald.conf(5) para detalhes.
|
/etc/systemd/journald.conf. Veja journald.conf(5) para detalhes.
|
||||||
|
|
||||||
-- e9bf28e6e834481bb6f48f548ad13606
|
-- e9bf28e6e834481bb6f48f548ad13606
|
||||||
|
|
|
@ -76,7 +76,7 @@ Documentation: man:journald.conf(5)
|
||||||
сообщения других служб не затронуты.
|
сообщения других служб не затронуты.
|
||||||
|
|
||||||
Предел, после которого служба журнала начинает игнорировать сообщения,
|
Предел, после которого служба журнала начинает игнорировать сообщения,
|
||||||
настраивается параметрами RateLimitInterval= и RateLimitBurst= в файле
|
настраивается параметрами RateLimitIntervalSec= и RateLimitBurst= в файле
|
||||||
/etc/systemd/journald.conf. Подробности смотрите на странице руководства
|
/etc/systemd/journald.conf. Подробности смотрите на странице руководства
|
||||||
journald.conf(5).
|
journald.conf(5).
|
||||||
|
|
||||||
|
|
|
@ -52,7 +52,7 @@ Documentation: man:journald.conf(5)
|
||||||
услуге нису захваћене овим.
|
услуге нису захваћене овим.
|
||||||
|
|
||||||
Ограничења која подешавају начин на који се поруке одбацују се могу подесити
|
Ограничења која подешавају начин на који се поруке одбацују се могу подесити
|
||||||
помоћу „RateLimitInterval=“ и „RateLimitBurst=“ параметара унутар датотеке
|
помоћу „RateLimitIntervalSec=“ и „RateLimitBurst=“ параметара унутар датотеке
|
||||||
/etc/systemd/journald.conf. Погледајте journald.conf(5) за појединости.
|
/etc/systemd/journald.conf. Погледајте journald.conf(5) за појединости.
|
||||||
|
|
||||||
-- e9bf28e6e834481bb6f48f548ad13606
|
-- e9bf28e6e834481bb6f48f548ad13606
|
||||||
|
|
|
@ -50,7 +50,7 @@ Documentation: man:journald.conf(5)
|
||||||
请注意只有由有问题的服务传来的消息被丢弃,
|
请注意只有由有问题的服务传来的消息被丢弃,
|
||||||
其它服务的消息不受影响。
|
其它服务的消息不受影响。
|
||||||
|
|
||||||
可以在 /etc/systemd/journald.conf 中设定 RateLimitInterval=
|
可以在 /etc/systemd/journald.conf 中设定 RateLimitIntervalSec=
|
||||||
以及 RateLimitBurst = 的值以控制丢弃信息的限制。
|
以及 RateLimitBurst = 的值以控制丢弃信息的限制。
|
||||||
请参见 journald.conf(5) 以了解详情。
|
请参见 journald.conf(5) 以了解详情。
|
||||||
|
|
||||||
|
|
|
@ -53,7 +53,7 @@ Documentation: man:journald.conf(5)
|
||||||
其他服務的訊息則不受影響。
|
其他服務的訊息則不受影響。
|
||||||
|
|
||||||
可以在 /etc/systemd/journald.conf 中設定
|
可以在 /etc/systemd/journald.conf 中設定
|
||||||
RateLimitInterval= 以及 RateLimitBurst=
|
RateLimitIntervalSec= 以及 RateLimitBurst=
|
||||||
來控制當訊息要開始被丟棄時的限制。參見 journald.conf(5) 以獲得更多資訊。
|
來控制當訊息要開始被丟棄時的限制。參見 journald.conf(5) 以獲得更多資訊。
|
||||||
|
|
||||||
-- e9bf28e6e834481bb6f48f548ad13606
|
-- e9bf28e6e834481bb6f48f548ad13606
|
||||||
|
|
|
@ -148,12 +148,12 @@
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><varname>RateLimitInterval=</varname></term>
|
<term><varname>RateLimitIntervalSec=</varname></term>
|
||||||
<term><varname>RateLimitBurst=</varname></term>
|
<term><varname>RateLimitBurst=</varname></term>
|
||||||
|
|
||||||
<listitem><para>Configures the rate limiting that is applied
|
<listitem><para>Configures the rate limiting that is applied
|
||||||
to all messages generated on the system. If, in the time
|
to all messages generated on the system. If, in the time
|
||||||
interval defined by <varname>RateLimitInterval=</varname>,
|
interval defined by <varname>RateLimitIntervalSec=</varname>,
|
||||||
more messages than specified in
|
more messages than specified in
|
||||||
<varname>RateLimitBurst=</varname> are logged by a service,
|
<varname>RateLimitBurst=</varname> are logged by a service,
|
||||||
all further messages within the interval are dropped until the
|
all further messages within the interval are dropped until the
|
||||||
|
@ -162,7 +162,7 @@
|
||||||
per-service, so that two services which log do not interfere
|
per-service, so that two services which log do not interfere
|
||||||
with each other's limits. Defaults to 1000 messages in 30s.
|
with each other's limits. Defaults to 1000 messages in 30s.
|
||||||
The time specification for
|
The time specification for
|
||||||
<varname>RateLimitInterval=</varname> may be specified in the
|
<varname>RateLimitIntervalSec=</varname> may be specified in the
|
||||||
following units: <literal>s</literal>, <literal>min</literal>,
|
following units: <literal>s</literal>, <literal>min</literal>,
|
||||||
<literal>h</literal>, <literal>ms</literal>,
|
<literal>h</literal>, <literal>ms</literal>,
|
||||||
<literal>us</literal>. To turn off any kind of rate limiting,
|
<literal>us</literal>. To turn off any kind of rate limiting,
|
||||||
|
|
|
@ -271,16 +271,16 @@
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><varname>DefaultStartLimitInterval=</varname></term>
|
<term><varname>DefaultStartLimitIntervalSec=</varname></term>
|
||||||
<term><varname>DefaultStartLimitBurst=</varname></term>
|
<term><varname>DefaultStartLimitBurst=</varname></term>
|
||||||
|
|
||||||
<listitem><para>Configure the default unit start rate
|
<listitem><para>Configure the default unit start rate
|
||||||
limiting, as configured per-service by
|
limiting, as configured per-service by
|
||||||
<varname>StartLimitInterval=</varname> and
|
<varname>StartLimitIntervalSec=</varname> and
|
||||||
<varname>StartLimitBurst=</varname>. See
|
<varname>StartLimitBurst=</varname>. See
|
||||||
<citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
|
<citerefentry><refentrytitle>systemd.service</refentrytitle><manvolnum>5</manvolnum></citerefentry>
|
||||||
for details on the per-service settings.
|
for details on the per-service settings.
|
||||||
<varname>DefaultStartLimitInterval=</varname> defaults to
|
<varname>DefaultStartLimitIntervalSec=</varname> defaults to
|
||||||
10s. <varname>DefaultStartLimitBurst=</varname> defaults to
|
10s. <varname>DefaultStartLimitBurst=</varname> defaults to
|
||||||
5.</para></listitem>
|
5.</para></listitem>
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
|
@ -751,14 +751,14 @@
|
||||||
</varlistentry>
|
</varlistentry>
|
||||||
|
|
||||||
<varlistentry>
|
<varlistentry>
|
||||||
<term><varname>StartLimitInterval=</varname></term>
|
<term><varname>StartLimitIntervalSec=</varname></term>
|
||||||
<term><varname>StartLimitBurst=</varname></term>
|
<term><varname>StartLimitBurst=</varname></term>
|
||||||
|
|
||||||
<listitem><para>Configure unit start rate limiting. By default, units which are started more than 5 times
|
<listitem><para>Configure unit start rate limiting. By default, units which are started more than 5 times
|
||||||
within 10 seconds are not permitted to start any more times until the 10 second interval ends. With these two
|
within 10 seconds are not permitted to start any more times until the 10 second interval ends. With these two
|
||||||
options, this rate limiting may be modified. Use <varname>StartLimitInterval=</varname> to configure the
|
options, this rate limiting may be modified. Use <varname>StartLimitIntervalSec=</varname> to configure the
|
||||||
checking interval (defaults to <varname>DefaultStartLimitInterval=</varname> in manager configuration file, set
|
checking interval (defaults to <varname>DefaultStartLimitIntervalSec=</varname> in manager configuration file,
|
||||||
to 0 to disable any kind of rate limiting). Use <varname>StartLimitBurst=</varname> to configure how many
|
set to 0 to disable any kind of rate limiting). Use <varname>StartLimitBurst=</varname> to configure how many
|
||||||
starts per interval are allowed (defaults to <varname>DefaultStartLimitBurst=</varname> in manager
|
starts per interval are allowed (defaults to <varname>DefaultStartLimitBurst=</varname> in manager
|
||||||
configuration file). These configuration options are particularly useful in conjunction with the service
|
configuration file). These configuration options are particularly useful in conjunction with the service
|
||||||
setting <varname>Restart=</varname> (see
|
setting <varname>Restart=</varname> (see
|
||||||
|
@ -777,7 +777,7 @@
|
||||||
<term><varname>StartLimitAction=</varname></term>
|
<term><varname>StartLimitAction=</varname></term>
|
||||||
|
|
||||||
<listitem><para>Configure the action to take if the rate limit configured with
|
<listitem><para>Configure the action to take if the rate limit configured with
|
||||||
<varname>StartLimitInterval=</varname> and <varname>StartLimitBurst=</varname> is hit. Takes one of
|
<varname>StartLimitIntervalSec=</varname> and <varname>StartLimitBurst=</varname> is hit. Takes one of
|
||||||
<option>none</option>, <option>reboot</option>, <option>reboot-force</option>,
|
<option>none</option>, <option>reboot</option>, <option>reboot-force</option>,
|
||||||
<option>reboot-immediate</option>, <option>poweroff</option>, <option>poweroff-force</option> or
|
<option>reboot-immediate</option>, <option>poweroff</option>, <option>poweroff-force</option> or
|
||||||
<option>poweroff-immediate</option>. If <option>none</option> is set, hitting the rate limit will trigger no
|
<option>poweroff-immediate</option>. If <option>none</option> is set, hitting the rate limit will trigger no
|
||||||
|
|
|
@ -2050,7 +2050,8 @@ const sd_bus_vtable bus_manager_vtable[] = {
|
||||||
SD_BUS_PROPERTY("DefaultTimeoutStartUSec", "t", bus_property_get_usec, offsetof(Manager, default_timeout_start_usec), SD_BUS_VTABLE_PROPERTY_CONST),
|
SD_BUS_PROPERTY("DefaultTimeoutStartUSec", "t", bus_property_get_usec, offsetof(Manager, default_timeout_start_usec), SD_BUS_VTABLE_PROPERTY_CONST),
|
||||||
SD_BUS_PROPERTY("DefaultTimeoutStopUSec", "t", bus_property_get_usec, offsetof(Manager, default_timeout_stop_usec), SD_BUS_VTABLE_PROPERTY_CONST),
|
SD_BUS_PROPERTY("DefaultTimeoutStopUSec", "t", bus_property_get_usec, offsetof(Manager, default_timeout_stop_usec), SD_BUS_VTABLE_PROPERTY_CONST),
|
||||||
SD_BUS_PROPERTY("DefaultRestartUSec", "t", bus_property_get_usec, offsetof(Manager, default_restart_usec), SD_BUS_VTABLE_PROPERTY_CONST),
|
SD_BUS_PROPERTY("DefaultRestartUSec", "t", bus_property_get_usec, offsetof(Manager, default_restart_usec), SD_BUS_VTABLE_PROPERTY_CONST),
|
||||||
SD_BUS_PROPERTY("DefaultStartLimitInterval", "t", bus_property_get_usec, offsetof(Manager, default_start_limit_interval), SD_BUS_VTABLE_PROPERTY_CONST),
|
SD_BUS_PROPERTY("DefaultStartLimitIntervalSec", "t", bus_property_get_usec, offsetof(Manager, default_start_limit_interval), SD_BUS_VTABLE_PROPERTY_CONST),
|
||||||
|
SD_BUS_PROPERTY("DefaultStartLimitInterval", "t", bus_property_get_usec, offsetof(Manager, default_start_limit_interval), SD_BUS_VTABLE_PROPERTY_CONST|SD_BUS_VTABLE_HIDDEN), /* obsolete alias name */
|
||||||
SD_BUS_PROPERTY("DefaultStartLimitBurst", "u", bus_property_get_unsigned, offsetof(Manager, default_start_limit_burst), SD_BUS_VTABLE_PROPERTY_CONST),
|
SD_BUS_PROPERTY("DefaultStartLimitBurst", "u", bus_property_get_unsigned, offsetof(Manager, default_start_limit_burst), SD_BUS_VTABLE_PROPERTY_CONST),
|
||||||
SD_BUS_PROPERTY("DefaultCPUAccounting", "b", bus_property_get_bool, offsetof(Manager, default_cpu_accounting), SD_BUS_VTABLE_PROPERTY_CONST),
|
SD_BUS_PROPERTY("DefaultCPUAccounting", "b", bus_property_get_bool, offsetof(Manager, default_cpu_accounting), SD_BUS_VTABLE_PROPERTY_CONST),
|
||||||
SD_BUS_PROPERTY("DefaultBlockIOAccounting", "b", bus_property_get_bool, offsetof(Manager, default_blockio_accounting), SD_BUS_VTABLE_PROPERTY_CONST),
|
SD_BUS_PROPERTY("DefaultBlockIOAccounting", "b", bus_property_get_bool, offsetof(Manager, default_blockio_accounting), SD_BUS_VTABLE_PROPERTY_CONST),
|
||||||
|
|
|
@ -704,7 +704,8 @@ const sd_bus_vtable bus_unit_vtable[] = {
|
||||||
SD_BUS_PROPERTY("Asserts", "a(sbbsi)", property_get_conditions, offsetof(Unit, asserts), 0),
|
SD_BUS_PROPERTY("Asserts", "a(sbbsi)", property_get_conditions, offsetof(Unit, asserts), 0),
|
||||||
SD_BUS_PROPERTY("LoadError", "(ss)", property_get_load_error, 0, SD_BUS_VTABLE_PROPERTY_CONST),
|
SD_BUS_PROPERTY("LoadError", "(ss)", property_get_load_error, 0, SD_BUS_VTABLE_PROPERTY_CONST),
|
||||||
SD_BUS_PROPERTY("Transient", "b", bus_property_get_bool, offsetof(Unit, transient), SD_BUS_VTABLE_PROPERTY_CONST),
|
SD_BUS_PROPERTY("Transient", "b", bus_property_get_bool, offsetof(Unit, transient), SD_BUS_VTABLE_PROPERTY_CONST),
|
||||||
SD_BUS_PROPERTY("StartLimitInterval", "t", bus_property_get_usec, offsetof(Unit, start_limit.interval), SD_BUS_VTABLE_PROPERTY_CONST),
|
SD_BUS_PROPERTY("StartLimitIntervalSec", "t", bus_property_get_usec, offsetof(Unit, start_limit.interval), SD_BUS_VTABLE_PROPERTY_CONST),
|
||||||
|
SD_BUS_PROPERTY("StartLimitInterval", "t", bus_property_get_usec, offsetof(Unit, start_limit.interval), SD_BUS_VTABLE_PROPERTY_CONST|SD_BUS_VTABLE_HIDDEN), /* obsolete alias name */
|
||||||
SD_BUS_PROPERTY("StartLimitBurst", "u", bus_property_get_unsigned, offsetof(Unit, start_limit.burst), SD_BUS_VTABLE_PROPERTY_CONST),
|
SD_BUS_PROPERTY("StartLimitBurst", "u", bus_property_get_unsigned, offsetof(Unit, start_limit.burst), SD_BUS_VTABLE_PROPERTY_CONST),
|
||||||
SD_BUS_PROPERTY("StartLimitAction", "s", property_get_failure_action, offsetof(Unit, start_limit_action), SD_BUS_VTABLE_PROPERTY_CONST),
|
SD_BUS_PROPERTY("StartLimitAction", "s", property_get_failure_action, offsetof(Unit, start_limit_action), SD_BUS_VTABLE_PROPERTY_CONST),
|
||||||
SD_BUS_PROPERTY("RebootArgument", "s", NULL, offsetof(Unit, reboot_arg), SD_BUS_VTABLE_PROPERTY_CONST),
|
SD_BUS_PROPERTY("RebootArgument", "s", NULL, offsetof(Unit, reboot_arg), SD_BUS_VTABLE_PROPERTY_CONST),
|
||||||
|
|
|
@ -164,6 +164,8 @@ Unit.IgnoreOnSnapshot, config_parse_warn_compat, DISABLED_LE
|
||||||
Unit.JobTimeoutSec, config_parse_sec_fix_0, 0, offsetof(Unit, job_timeout)
|
Unit.JobTimeoutSec, config_parse_sec_fix_0, 0, offsetof(Unit, job_timeout)
|
||||||
Unit.JobTimeoutAction, config_parse_failure_action, 0, offsetof(Unit, job_timeout_action)
|
Unit.JobTimeoutAction, config_parse_failure_action, 0, offsetof(Unit, job_timeout_action)
|
||||||
Unit.JobTimeoutRebootArgument, config_parse_string, 0, offsetof(Unit, job_timeout_reboot_arg)
|
Unit.JobTimeoutRebootArgument, config_parse_string, 0, offsetof(Unit, job_timeout_reboot_arg)
|
||||||
|
Unit.StartLimitIntervalSec, config_parse_sec, 0, offsetof(Unit, start_limit.interval)
|
||||||
|
m4_dnl The following is a legacy alias name for compatibility
|
||||||
Unit.StartLimitInterval, config_parse_sec, 0, offsetof(Unit, start_limit.interval)
|
Unit.StartLimitInterval, config_parse_sec, 0, offsetof(Unit, start_limit.interval)
|
||||||
Unit.StartLimitBurst, config_parse_unsigned, 0, offsetof(Unit, start_limit.burst)
|
Unit.StartLimitBurst, config_parse_unsigned, 0, offsetof(Unit, start_limit.burst)
|
||||||
Unit.StartLimitAction, config_parse_failure_action, 0, offsetof(Unit, start_limit_action)
|
Unit.StartLimitAction, config_parse_failure_action, 0, offsetof(Unit, start_limit_action)
|
||||||
|
|
|
@ -670,7 +670,8 @@ static int parse_config_file(void) {
|
||||||
{ "Manager", "DefaultTimeoutStartSec", config_parse_sec, 0, &arg_default_timeout_start_usec },
|
{ "Manager", "DefaultTimeoutStartSec", config_parse_sec, 0, &arg_default_timeout_start_usec },
|
||||||
{ "Manager", "DefaultTimeoutStopSec", config_parse_sec, 0, &arg_default_timeout_stop_usec },
|
{ "Manager", "DefaultTimeoutStopSec", config_parse_sec, 0, &arg_default_timeout_stop_usec },
|
||||||
{ "Manager", "DefaultRestartSec", config_parse_sec, 0, &arg_default_restart_usec },
|
{ "Manager", "DefaultRestartSec", config_parse_sec, 0, &arg_default_restart_usec },
|
||||||
{ "Manager", "DefaultStartLimitInterval", config_parse_sec, 0, &arg_default_start_limit_interval },
|
{ "Manager", "DefaultStartLimitInterval", config_parse_sec, 0, &arg_default_start_limit_interval }, /* obsolete alias */
|
||||||
|
{ "Manager", "DefaultStartLimitIntervalSec",config_parse_sec, 0, &arg_default_start_limit_interval },
|
||||||
{ "Manager", "DefaultStartLimitBurst", config_parse_unsigned, 0, &arg_default_start_limit_burst },
|
{ "Manager", "DefaultStartLimitBurst", config_parse_unsigned, 0, &arg_default_start_limit_burst },
|
||||||
{ "Manager", "DefaultEnvironment", config_parse_environ, 0, &arg_default_environment },
|
{ "Manager", "DefaultEnvironment", config_parse_environ, 0, &arg_default_environment },
|
||||||
{ "Manager", "DefaultLimitCPU", config_parse_limit, RLIMIT_CPU, arg_default_rlimit },
|
{ "Manager", "DefaultLimitCPU", config_parse_limit, RLIMIT_CPU, arg_default_rlimit },
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
#DefaultTimeoutStartSec=90s
|
#DefaultTimeoutStartSec=90s
|
||||||
#DefaultTimeoutStopSec=90s
|
#DefaultTimeoutStopSec=90s
|
||||||
#DefaultRestartSec=100ms
|
#DefaultRestartSec=100ms
|
||||||
#DefaultStartLimitInterval=10s
|
#DefaultStartLimitIntervalSec=10s
|
||||||
#DefaultStartLimitBurst=5
|
#DefaultStartLimitBurst=5
|
||||||
#DefaultEnvironment=
|
#DefaultEnvironment=
|
||||||
#DefaultCPUAccounting=no
|
#DefaultCPUAccounting=no
|
||||||
|
|
|
@ -23,7 +23,7 @@
|
||||||
#DefaultTimeoutStartSec=90s
|
#DefaultTimeoutStartSec=90s
|
||||||
#DefaultTimeoutStopSec=90s
|
#DefaultTimeoutStopSec=90s
|
||||||
#DefaultRestartSec=100ms
|
#DefaultRestartSec=100ms
|
||||||
#DefaultStartLimitInterval=10s
|
#DefaultStartLimitIntervalSec=10s
|
||||||
#DefaultStartLimitBurst=5
|
#DefaultStartLimitBurst=5
|
||||||
#DefaultEnvironment=
|
#DefaultEnvironment=
|
||||||
#DefaultLimitCPU=
|
#DefaultLimitCPU=
|
||||||
|
|
|
@ -19,7 +19,9 @@ Journal.Storage, config_parse_storage, 0, offsetof(Server, storage
|
||||||
Journal.Compress, config_parse_bool, 0, offsetof(Server, compress)
|
Journal.Compress, config_parse_bool, 0, offsetof(Server, compress)
|
||||||
Journal.Seal, config_parse_bool, 0, offsetof(Server, seal)
|
Journal.Seal, config_parse_bool, 0, offsetof(Server, seal)
|
||||||
Journal.SyncIntervalSec, config_parse_sec, 0, offsetof(Server, sync_interval_usec)
|
Journal.SyncIntervalSec, config_parse_sec, 0, offsetof(Server, sync_interval_usec)
|
||||||
|
# The following is a legacy name for compatibility
|
||||||
Journal.RateLimitInterval, config_parse_sec, 0, offsetof(Server, rate_limit_interval)
|
Journal.RateLimitInterval, config_parse_sec, 0, offsetof(Server, rate_limit_interval)
|
||||||
|
Journal.RateLimitIntervalSec,config_parse_sec, 0, offsetof(Server, rate_limit_interval)
|
||||||
Journal.RateLimitBurst, config_parse_unsigned, 0, offsetof(Server, rate_limit_burst)
|
Journal.RateLimitBurst, config_parse_unsigned, 0, offsetof(Server, rate_limit_burst)
|
||||||
Journal.SystemMaxUse, config_parse_iec_uint64, 0, offsetof(Server, system_metrics.max_use)
|
Journal.SystemMaxUse, config_parse_iec_uint64, 0, offsetof(Server, system_metrics.max_use)
|
||||||
Journal.SystemMaxFileSize, config_parse_iec_uint64, 0, offsetof(Server, system_metrics.max_size)
|
Journal.SystemMaxFileSize, config_parse_iec_uint64, 0, offsetof(Server, system_metrics.max_size)
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
#Seal=yes
|
#Seal=yes
|
||||||
#SplitMode=uid
|
#SplitMode=uid
|
||||||
#SyncIntervalSec=5m
|
#SyncIntervalSec=5m
|
||||||
#RateLimitInterval=30s
|
#RateLimitIntervalSec=30s
|
||||||
#RateLimitBurst=1000
|
#RateLimitBurst=1000
|
||||||
#SystemMaxUse=
|
#SystemMaxUse=
|
||||||
#SystemKeepFree=
|
#SystemKeepFree=
|
||||||
|
|
Loading…
Reference in a new issue