matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

lib: add log immediate-mode to running config output

Browse source 
The immediate-mode config wasn't in the running config output;
add it.

Signed-off-by: Mark Stapp <mjs@labn.net>
This commit is contained in:
Mark Stapp 2024-01-24 13:00:41 -05:00
parent d1ce73a0fe
commit 2889d0e7a6
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/log_vty.c
View file

@ -902,6 +902,8 @@ void log_config_write(struct vty *vty)
vty_out(vty, "no log error-category\n"); vty_out(vty, "no log error-category\n");
if (!zlog_get_prefix_xid()) if (!zlog_get_prefix_xid())
vty_out(vty, "no log unique-id\n"); vty_out(vty, "no log unique-id\n");
if (zlog_get_immediate_mode())
vty_out(vty, "log immediate-mode\n");
if (logmsgs_with_persist_bt) { if (logmsgs_with_persist_bt) {
struct xrefdata *xrd; struct xrefdata *xrd;

11
lib/zlog.c
View file

@ -84,7 +84,7 @@ static struct zlog_targets_head zlog_targets;
/* Global setting for buffered vs immediate output. The default is /* Global setting for buffered vs immediate output. The default is
* per-pthread buffering. * per-pthread buffering.
*/ */
static bool default_immediate; static bool zlog_default_immediate;
/* cf. zlog.h for additional comments on this struct. /* cf. zlog.h for additional comments on this struct.
* *
@ -445,7 +445,7 @@ static void vzlog_tls(struct zlog_tls *zlog_tls, const struct xref_logmsg *xref,
struct zlog_msg *msg; struct zlog_msg *msg;
char *buf; char *buf;
bool ignoremsg = true; bool ignoremsg = true;
bool immediate = default_immediate; bool immediate = zlog_default_immediate;
/* avoid further processing cost if no target wants this message */ /* avoid further processing cost if no target wants this message */
rcu_read_lock(); rcu_read_lock();
@ -966,7 +966,12 @@ struct zlog_target *zlog_target_replace(struct zlog_target *oldzt,
*/ */
void zlog_set_immediate(bool set_p) void zlog_set_immediate(bool set_p)
{ {
default_immediate = set_p; zlog_default_immediate = set_p;
}
bool zlog_get_immediate_mode(void)
{
return zlog_default_immediate;
} }
/* common init */ /* common init */

1
lib/zlog.h
View file

@ -276,6 +276,7 @@ extern void zlog_tls_buffer_fini(void);
/* Enable or disable 'immediate' output - default is to buffer messages. */ /* Enable or disable 'immediate' output - default is to buffer messages. */
extern void zlog_set_immediate(bool set_p); extern void zlog_set_immediate(bool set_p);
bool zlog_get_immediate_mode(void);
extern const char *zlog_priority_str(int priority); extern const char *zlog_priority_str(int priority);