]> git.proxmox.com Git - mirror_frr.git/commitdiff
watchfrr: Convert to not use warning in warning messages
authorDonald Sharp <sharpd@nvidia.com>
Wed, 10 Mar 2021 01:02:26 +0000 (20:02 -0500)
committerDonald Sharp <sharpd@nvidia.com>
Wed, 10 Mar 2021 01:02:26 +0000 (20:02 -0500)
We do not need to display: `Warning: ...` in a zlog_warn
message

Signed-off-by: Donald Sharp <sharpd@nvidia.com>
watchfrr/watchfrr.c

index 441320b1931abc90af1a8e93257c6debda02615b..5f4d564507e94c34ebb4e7601e9a8a94f3fa9621 100644 (file)
@@ -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,