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

lib: when running as a daemon, only redirect sdtin, stdout, sdterr to null when a tty.

Browse Source 
Also write memstat to stderr when stderr is not a tty
     and allow for --log stdout

Signed-off-by: Lou Berger <lberger@labn.net>
This commit is contained in:
Lou Berger 2022-10-02 15:56:07 +00:00 committed by Christian Hopps
parent 39869a3597
commit 4d28aea958
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
lib/libfrr.c
View File

@ -130,6 +130,7 @@ static const struct optspec os_always = {
" --limit-fds Limit number of fds supported\n", " --limit-fds Limit number of fds supported\n",
lo_always}; lo_always};
static bool logging_to_stdout = false; /* set when --log stdout specified */
static const struct option lo_cfg[] = { static const struct option lo_cfg[] = {
{"config_file", required_argument, NULL, 'f'}, {"config_file", required_argument, NULL, 'f'},
@ -738,6 +739,11 @@ struct event_loop *frr_init(void)
while ((log_arg = log_args_pop(di->early_logging))) { while ((log_arg = log_args_pop(di->early_logging))) {
command_setup_early_logging(log_arg->target, command_setup_early_logging(log_arg->target,
di->early_loglevel); di->early_loglevel);
/* this is a bit of a hack,
but need to notice when
the target is stdout */
if (strcmp(log_arg->target, "stdout") == 0)
logging_to_stdout = true;
XFREE(MTYPE_TMP, log_arg); XFREE(MTYPE_TMP, log_arg);
} }
@ -1088,9 +1094,15 @@ static void frr_terminal_close(int isexit)
"%s: failed to open /dev/null: %s", __func__, "%s: failed to open /dev/null: %s", __func__,
safe_strerror(errno)); safe_strerror(errno));
} else { } else {
dup2(nullfd, 0); int fd;
dup2(nullfd, 1); /*
dup2(nullfd, 2); * only redirect stdin, stdout, stderr to null when a tty also
* don't redirect when stdout is set with --log stdout
*/
for (fd = 2; fd >= 0; fd--)
if (isatty(fd) &&
(fd != STDOUT_FILENO || !logging_to_stdout))
dup2(nullfd, fd);
close(nullfd); close(nullfd);
} }
} }
@ -1168,9 +1180,16 @@ void frr_run(struct event_loop *master)
"%s: failed to open /dev/null: %s", "%s: failed to open /dev/null: %s",
__func__, safe_strerror(errno)); __func__, safe_strerror(errno));
} else { } else {
dup2(nullfd, 0); int fd;
dup2(nullfd, 1); /*
dup2(nullfd, 2); * only redirect stdin, stdout, stderr to null when a
* tty also don't redirect when stdout is set with --log
* stdout
*/
for (fd = 2; fd >= 0; fd--)
if (isatty(fd) &&
(fd != STDOUT_FILENO || !logging_to_stdout))
dup2(nullfd, fd);
close(nullfd); close(nullfd);
} }
@ -1194,7 +1213,7 @@ void frr_fini(void)
{ {
FILE *fp; FILE *fp;
char filename[128]; char filename[128];
int have_leftovers; int have_leftovers = 0;
hook_call(frr_fini); hook_call(frr_fini);
@ -1220,16 +1239,15 @@ void frr_fini(void)
/* frrmod_init -> nothing needed / hooks */ /* frrmod_init -> nothing needed / hooks */
rcu_shutdown(); rcu_shutdown();
if (!debug_memstats_at_exit) /* also log memstats to stderr when stderr goes to a file*/
return; if (debug_memstats_at_exit || !isatty(STDERR_FILENO))
have_leftovers = log_memstats(stderr, di->name); have_leftovers = log_memstats(stderr, di->name);
/* in case we decide at runtime that we want exit-memstats for /* in case we decide at runtime that we want exit-memstats for
* a daemon, but it has no stderr because it's daemonized * a daemon
* (only do this if we actually have something to print though) * (only do this if we actually have something to print though)
*/ */
if (!have_leftovers) if (!debug_memstats_at_exit || !have_leftovers)
return; return;
snprintf(filename, sizeof(filename), "/tmp/frr-memstats-%s-%llu-%llu", snprintf(filename, sizeof(filename), "/tmp/frr-memstats-%s-%llu-%llu",