initctl: show the restart delay of a service with restart-max-sec

With restart-max-sec the delay before the next restart varies, and
nothing showed what it was or how far it could grow.

Show both in initctl status, for a service that has the setting:

       Restarts : 7 (4/-1)
     Restart in : 160 sec (max 300)

Add the D-Bus properties RestartDelay and RestartDelayMax for it, so
the status is the same when initctl goes over D-Bus.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg committed 2026-11-19 20:39:43 +01:00
1 parent 7f652770e3
commit 308287923d
6 files changed
+30 -2

No files matched your search

+9
View File
@@ -1495,6 +1495,8 @@ struct svc_row {
int32_t restart_tot;
int32_t restart_cnt;
int32_t restart_max; /* -1 = restart:always */
uint32_t restart_delay; /* seconds, before the next restart */
uint32_t restart_delay_max; /* restart-max-sec, 0 = not set */
int manual;
int forking;
int started;
@@ -1525,6 +1527,8 @@ static void fill_row_from_svc(struct svc_row *r, svc_t *svc)
r->restart_tot = (int32_t)svc->restart_tot;
r->restart_cnt = (int32_t)svc->restart_cnt;
r->restart_max = (int32_t)svc->restart_max;
r->restart_delay = (uint32_t)svc->restart_tmo / 1000;
r->restart_delay_max = (uint32_t)svc->restart_tmo_max / 1000;
r->manual = svc->manual;
r->forking = svc->forking;
r->started = svc->started;
@@ -1940,6 +1944,9 @@ static int show_one_row(struct svc_row *r)
printf(" Starts : %u\n", r->starts);
printf(" Restarts : %d (%d/%d)\n",
r->restart_tot, r->restart_cnt, r->restart_max);
if (r->restart_delay_max)
printf(" Restart in : %u sec (max %u)\n",
r->restart_delay, r->restart_delay_max);
printf(" Runlevels : %s\n",
runlevel_string(runlevel, (int)r->runlevels));
@@ -2055,6 +2062,8 @@ static const struct row_field {
ROW_U32 ("RestartsTotal", restart_tot),
ROW_U32 ("RestartCount", restart_cnt),
ROW_U32 ("RestartMax", restart_max),
ROW_U32 ("RestartDelay", restart_delay),
ROW_U32 ("RestartDelayMax", restart_delay_max),
ROW_BOOL("ManualStart", manual),
ROW_BOOL("Forking", forking),
ROW_BOOL("Started", started),