proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-15 11:30:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

watchfrr: Convert to not use warning in warning messages

Browse Source 
We do not need to display: `Warning: ...` in a zlog_warn
message

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
This commit is contained in:
Donald Sharp 2021-03-09 20:02:26 -05:00
parent c067e23e54
commit 957cfa2466
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
watchfrr/watchfrr.c
View File

@ -316,7 +316,7 @@ static pid_t run_background(char *shell_cmd)
/* Use separate process group so child processes can be killed /* Use separate process group so child processes can be killed
* easily. */ * easily. */
if (setpgid(0, 0) < 0) if (setpgid(0, 0) < 0)
zlog_warn("warning: setpgid(0,0) failed: %s", zlog_warn("setpgid(0,0) failed: %s",
safe_strerror(errno)); safe_strerror(errno));
{ {
char shell[] = "sh"; char shell[] = "sh";
@ -356,7 +356,7 @@ static int restart_kill(struct thread *t_kill)
time_elapsed(&delay, &restart->time); time_elapsed(&delay, &restart->time);
zlog_warn( 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, restart->what, restart->name, (int)restart->pid,
(long)delay.tv_sec, (restart->kills ? SIGKILL : SIGTERM)); (long)delay.tv_sec, (restart->kills ? SIGKILL : SIGTERM));
kill(-restart->pid, (restart->kills ? SIGKILL : SIGTERM)); kill(-restart->pid, (restart->kills ? SIGKILL : SIGTERM));
@ -423,7 +423,7 @@ static void sigchild(void)
what = "background"; what = "background";
} }
if (WIFSTOPPED(status)) 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); (int)child);
else if (WIFSIGNALED(status)) else if (WIFSIGNALED(status))
zlog_warn("%s %s process %d terminated due to signal %d", what, zlog_warn("%s %s process %d terminated due to signal %d", what,