From 957cfa2466c319d3fc2b5c3015fb8b240f12bab7 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Tue, 9 Mar 2021 20:02:26 -0500 Subject: [PATCH] watchfrr: Convert to not use warning in warning messages We do not need to display: `Warning: ...` in a zlog_warn message Signed-off-by: Donald Sharp --- watchfrr/watchfrr.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/watchfrr/watchfrr.c b/watchfrr/watchfrr.c index 441320b193..5f4d564507 100644 --- a/watchfrr/watchfrr.c +++ b/watchfrr/watchfrr.c @@ -316,7 +316,7 @@ static pid_t run_background(char *shell_cmd) /* Use separate process group so child processes can be killed * easily. */ if (setpgid(0, 0) < 0) - zlog_warn("warning: setpgid(0,0) failed: %s", + zlog_warn("setpgid(0,0) failed: %s", safe_strerror(errno)); { char shell[] = "sh"; @@ -356,7 +356,7 @@ static int restart_kill(struct thread *t_kill) time_elapsed(&delay, &restart->time); zlog_warn( - "Warning: %s %s child process %d still running after %ld seconds, sending signal %d", + "%s %s child process %d still running after %ld seconds, sending signal %d", restart->what, restart->name, (int)restart->pid, (long)delay.tv_sec, (restart->kills ? SIGKILL : SIGTERM)); kill(-restart->pid, (restart->kills ? SIGKILL : SIGTERM)); @@ -423,7 +423,7 @@ static void sigchild(void) what = "background"; } if (WIFSTOPPED(status)) - zlog_warn("warning: %s %s process %d is stopped", what, name, + zlog_warn("%s %s process %d is stopped", what, name, (int)child); else if (WIFSIGNALED(status)) zlog_warn("%s %s process %d terminated due to signal %d", what, -- 2.39.5