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

lib: make a few log symbols accessible

Browse Source 
Might've made a few things too many `static` there.

Signed-off-by: David Lamparter <equinox@diac24.net>
This commit is contained in:
David Lamparter 2021-04-11 18:23:16 +02:00 committed by David Lamparter
parent 5c58f5d336
commit c6610ea98f
4 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/log_vty.c
View File

@ -58,7 +58,7 @@ static struct zlog_cfg_filterfile zt_filterfile = {
}, },
}; };
static const char *zlog_progname; const char *zlog_progname;
static const char *zlog_protoname; static const char *zlog_protoname;
static const struct facility_map { static const struct facility_map {
@ -95,7 +95,14 @@ static const char * const zlog_priority[] = {
"notifications", "informational", "debugging", NULL, "notifications", "informational", "debugging", NULL,
}; };
static const char *facility_name(int facility) const char *zlog_priority_str(int priority)
{
if (priority > LOG_DEBUG)
return "???";
return zlog_priority[priority];
}
const char *facility_name(int facility)
{ {
const struct facility_map *fm; const struct facility_map *fm;
@ -105,7 +112,7 @@ static const char *facility_name(int facility)
return ""; return "";
} }
static int facility_match(const char *str) int facility_match(const char *str)
{ {
const struct facility_map *fm; const struct facility_map *fm;

3
lib/log_vty.h
View File

@ -34,6 +34,9 @@ extern void log_config_write(struct vty *vty);
extern int log_level_match(const char *s); extern int log_level_match(const char *s);
extern void log_show_syslog(struct vty *vty); extern void log_show_syslog(struct vty *vty);
extern int facility_match(const char *str);
extern const char *facility_name(int facility);
DECLARE_HOOK(zlog_rotate, (), ()); DECLARE_HOOK(zlog_rotate, (), ());
extern void zlog_rotate(void); extern void zlog_rotate(void);

5
lib/zlog.h
View File

@ -37,10 +37,13 @@
extern "C" { extern "C" {
#endif #endif
DECLARE_MGROUP(LOG);
extern char zlog_prefix[]; extern char zlog_prefix[];
extern size_t zlog_prefixsz; extern size_t zlog_prefixsz;
extern int zlog_tmpdirfd; extern int zlog_tmpdirfd;
extern int zlog_instance; extern int zlog_instance;
extern const char *zlog_progname;
struct xref_logmsg { struct xref_logmsg {
struct xref xref; struct xref xref;
@ -274,6 +277,8 @@ 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);
extern const char *zlog_priority_str(int priority);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

1
lib/zlog_targets.c
View File

@ -31,7 +31,6 @@
* absolute end. * absolute end.
*/ */
DECLARE_MGROUP(LOG);
DEFINE_MGROUP_ACTIVEATEXIT(LOG, "logging subsystem"); DEFINE_MGROUP_ACTIVEATEXIT(LOG, "logging subsystem");
DEFINE_MTYPE_STATIC(LOG, LOG_FD, "log file target"); DEFINE_MTYPE_STATIC(LOG, LOG_FD, "log file target");