Skip to content

Commit 7fba137

Browse files
committed
Reformat signaling log messages for readability
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
1 parent 4356701 commit 7fba137

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

src/service.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1153,7 +1153,7 @@ int service_stop(svc_t *svc)
11531153
service_timeout_cancel(svc);
11541154

11551155
if (svc->stop_script[0]) {
1156-
logit(LOG_CONSOLE | LOG_NOTICE, "%s[%d], calling stop:%s ...", id, svc->pid, svc->stop_script);
1156+
logit(LOG_CONSOLE | LOG_NOTICE, "Stopping %s[%d], calling stop:%s ...", id, svc->pid, svc->stop_script);
11571157
} else if (!svc_is_sysv(svc)) {
11581158
char *nm = pid_get_name(svc->pid, NULL, 0);
11591159
const char *sig = sig_name(svc->sighalt);
@@ -1168,10 +1168,10 @@ int service_stop(svc_t *svc)
11681168
}
11691169

11701170
dbg("Sending %s to pid:%d name:%s(%s)", sig, svc->pid, id, nm);
1171-
logit(LOG_CONSOLE | LOG_NOTICE, "%s[%d], stopping, sending %s ...", id, svc->pid, sig);
1171+
logit(LOG_CONSOLE | LOG_NOTICE, "Stopping %s[%d], sending %s ...", id, svc->pid, sig);
11721172
} else {
11731173
compose_cmdline(svc, cmdline, sizeof(cmdline));
1174-
logit(LOG_CONSOLE | LOG_NOTICE, "%s[%d], calling '%s stop' ...", id, svc->pid, cmdline);
1174+
logit(LOG_CONSOLE | LOG_NOTICE, "Stopping %s[%d], calling '%s stop' ...", id, svc->pid, cmdline);
11751175
}
11761176

11771177
/*
@@ -1291,16 +1291,16 @@ static int service_reload(svc_t *svc)
12911291
print_desc("Restarting ", svc->desc);
12921292

12931293
if (svc->reload_script[0]) {
1294-
logit(LOG_CONSOLE | LOG_NOTICE, "%s[%d], calling reload:%s ...", id, svc->pid, svc->reload_script);
1294+
logit(LOG_CONSOLE | LOG_NOTICE, "Reloading %s[%d], calling reload:%s ...", id, svc->pid, svc->reload_script);
12951295
rc = service_run_script(svc, svc->reload_script);
12961296
} else if (svc->sighup) {
12971297
if (svc->pid <= 1) {
12981298
dbg("%s[%d]: bad PID, cannot reload service", id, svc->pid);
12991299
svc->start_time = svc->pid = 0;
13001300
goto done;
13011301
}
1302-
dbg("%s[%d], sending SIGHUP", id, svc->pid);
1303-
logit(LOG_CONSOLE | LOG_NOTICE, "%s[%d], sending SIGHUP ...", id, svc->pid);
1302+
dbg("Reloading %s[%d], sending SIGHUP", id, svc->pid);
1303+
logit(LOG_CONSOLE | LOG_NOTICE, "Reloading %s[%d], sending SIGHUP ...", id, svc->pid);
13041304
rc = kill(svc->pid, SIGHUP);
13051305
if (rc == -1 && (errno == ESRCH || errno == ENOENT)) {
13061306
/* nobody home, reset internal state machine */

0 commit comments

Comments
 (0)