proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-06-14 20:31:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

lib: introduce flog() to simplify the northbound code a little bit

Browse Source 
flog() is a small wrapper around zlog() that can be useful in a
few places to reduce code duplication.

Signed-off-by: Renato Westphal <renato@opensourcerouting.org>
This commit is contained in:
Renato Westphal 2019-04-15 19:03:57 -03:00
parent e412d3b8d9
commit c650e48c54
2 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/log.h
View File

@ -103,7 +103,8 @@ extern void zlog(int priority, const char *format, ...) PRINTF_ATTRIBUTE(2, 3);
flog_err(ferr_id, format, ##__VA_ARGS__) flog_err(ferr_id, format, ##__VA_ARGS__)
#define flog_warn(ferr_id, format, ...) \ #define flog_warn(ferr_id, format, ...) \
zlog_warn("[EC %" PRIu32 "] " format, ferr_id, ##__VA_ARGS__) zlog_warn("[EC %" PRIu32 "] " format, ferr_id, ##__VA_ARGS__)
#define flog(priority, ferr_id, format, ...) \
zlog(priority, "[EC %" PRIu32 "] " format, ferr_id, ##__VA_ARGS__)
extern void zlog_thread_info(int log_level); extern void zlog_thread_info(int log_level);

32
lib/northbound.c
View File

@ -753,39 +753,43 @@ static int nb_callback_configuration(const enum nb_event event,
ret = (*nb_node->cbs.move)(event, dnode); ret = (*nb_node->cbs.move)(event, dnode);
break; break;
default: default:
break; flog_err(EC_LIB_DEVELOPMENT,
"%s: unknown operation (%u) [xpath %s]", __func__,
operation, xpath);
exit(1);
} }
if (ret != NB_OK) { if (ret != NB_OK) {
enum lib_log_refs ref = 0; int priority;
enum lib_log_refs ref;
switch (event) { switch (event) {
case NB_EV_VALIDATE: case NB_EV_VALIDATE:
priority = LOG_WARNING;
ref = EC_LIB_NB_CB_CONFIG_VALIDATE; ref = EC_LIB_NB_CB_CONFIG_VALIDATE;
break; break;
case NB_EV_PREPARE: case NB_EV_PREPARE:
priority = LOG_WARNING;
ref = EC_LIB_NB_CB_CONFIG_PREPARE; ref = EC_LIB_NB_CB_CONFIG_PREPARE;
break; break;
case NB_EV_ABORT: case NB_EV_ABORT:
priority = LOG_WARNING;
ref = EC_LIB_NB_CB_CONFIG_ABORT; ref = EC_LIB_NB_CB_CONFIG_ABORT;
break; break;
case NB_EV_APPLY: case NB_EV_APPLY:
priority = LOG_ERR;
ref = EC_LIB_NB_CB_CONFIG_APPLY; ref = EC_LIB_NB_CB_CONFIG_APPLY;
break; break;
default:
flog_err(EC_LIB_DEVELOPMENT,
"%s: unknown event (%u) [xpath %s]",
__func__, event, xpath);
exit(1);
} }
if (event == NB_EV_VALIDATE || event == NB_EV_PREPARE)
flog_warn( flog(priority, ref,
ref,
"%s: error processing configuration change: error [%s] event [%s] operation [%s] xpath [%s]", "%s: error processing configuration change: error [%s] event [%s] operation [%s] xpath [%s]",
__func__, nb_err_name(ret), __func__, nb_err_name(ret), nb_event_name(event),
nb_event_name(event),
nb_operation_name(operation), xpath);
else
flog_err(
ref,
"%s: error processing configuration change: error [%s] event [%s] operation [%s] xpath [%s]",
__func__, nb_err_name(ret),
nb_event_name(event),
nb_operation_name(operation), xpath); nb_operation_name(operation), xpath);
} }