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

Merge pull request #3123 from opensourcerouting/6.0-error-code-switch

Browse Source 
[6.0] lib: add "log error-code" switch
This commit is contained in:
Quentin Young 2018-10-03 20:31:50 -04:00 committed by GitHub
commit 53aa82daaf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/command.c
View File

@ -570,6 +570,9 @@ static int config_write_host(struct vty *vty)
if (zlog_default->record_priority == 1) if (zlog_default->record_priority == 1)
vty_out(vty, "log record-priority\n"); vty_out(vty, "log record-priority\n");
if (zlog_default->error_code)
vty_out(vty, "log error-code\n");
if (zlog_default->timestamp_precision > 0) if (zlog_default->timestamp_precision > 0)
vty_out(vty, "log timestamp precision %d\n", vty_out(vty, "log timestamp precision %d\n",
zlog_default->timestamp_precision); zlog_default->timestamp_precision);
@ -2334,6 +2337,8 @@ DEFUN (show_logging,
vty_out(vty, "Protocol name: %s\n", zl->protoname); vty_out(vty, "Protocol name: %s\n", zl->protoname);
vty_out(vty, "Record priority: %s\n", vty_out(vty, "Record priority: %s\n",
(zl->record_priority ? "enabled" : "disabled")); (zl->record_priority ? "enabled" : "disabled"));
vty_out(vty, "Error code: %s\n",
(zl->error_code ? "enabled" : "disabled"));
vty_out(vty, "Timestamp precision: %d\n", zl->timestamp_precision); vty_out(vty, "Timestamp precision: %d\n", zl->timestamp_precision);
return CMD_SUCCESS; return CMD_SUCCESS;
@ -2612,6 +2617,17 @@ DEFUN (no_config_log_record_priority,
return CMD_SUCCESS; return CMD_SUCCESS;
} }
DEFUN (config_log_error_code,
config_log_error_code_cmd,
"[no] log error-code",
NO_STR
"Logging control\n"
"Log the error code number where available\n")
{
zlog_default->error_code = !!strcmp(argv[0]->text, "no");
return CMD_SUCCESS;
}
DEFUN (config_log_timestamp_precision, DEFUN (config_log_timestamp_precision,
config_log_timestamp_precision_cmd, config_log_timestamp_precision_cmd,
"log timestamp precision (0-6)", "log timestamp precision (0-6)",
@ -2883,6 +2899,7 @@ void cmd_init(int terminal)
install_element(CONFIG_NODE, &config_log_record_priority_cmd); install_element(CONFIG_NODE, &config_log_record_priority_cmd);
install_element(CONFIG_NODE, install_element(CONFIG_NODE,
&no_config_log_record_priority_cmd); &no_config_log_record_priority_cmd);
install_element(CONFIG_NODE, &config_log_error_code_cmd);
install_element(CONFIG_NODE, install_element(CONFIG_NODE,
&config_log_timestamp_precision_cmd); &config_log_timestamp_precision_cmd);
install_element(CONFIG_NODE, install_element(CONFIG_NODE,

17
lib/log.c
View File

@ -684,6 +684,23 @@ ZLOG_FUNC(zlog_debug, LOG_DEBUG)
#undef ZLOG_FUNC #undef ZLOG_FUNC
void zlog_err_id(uint32_t id, const char *format, ...)
{
va_list args;
va_start(args, format);
if (zlog_default && zlog_default->error_code) {
char newfmt[strlen(format) + 32];
snprintf(newfmt, sizeof(newfmt), "[EC %"PRIu32"] %s", id,
format);
vzlog(LOG_ERR, newfmt, args);
} else {
vzlog(LOG_ERR, format, args);
}
va_end(args);
}
void zlog_thread_info(int log_level) void zlog_thread_info(int log_level)
{ {
struct thread *tc; struct thread *tc;

4
lib/log.h
View File

@ -79,6 +79,8 @@ extern void closezlog(void);
#endif /* __GNUC__ */ #endif /* __GNUC__ */
/* Handy zlog functions. */ /* Handy zlog functions. */
extern void zlog_err_id(uint32_t id, const char *format, ...)
PRINTF_ATTRIBUTE(2, 3);
extern void zlog_err(const char *format, ...) PRINTF_ATTRIBUTE(1, 2); extern void zlog_err(const char *format, ...) PRINTF_ATTRIBUTE(1, 2);
extern void zlog_warn(const char *format, ...) PRINTF_ATTRIBUTE(1, 2); extern void zlog_warn(const char *format, ...) PRINTF_ATTRIBUTE(1, 2);
extern void zlog_info(const char *format, ...) PRINTF_ATTRIBUTE(1, 2); extern void zlog_info(const char *format, ...) PRINTF_ATTRIBUTE(1, 2);
@ -87,7 +89,7 @@ extern void zlog_debug(const char *format, ...) PRINTF_ATTRIBUTE(1, 2);
/* For logs which have error codes associated with them */ /* For logs which have error codes associated with them */
#define flog_err(ferr_id, format, ...) \ #define flog_err(ferr_id, format, ...) \
zlog_err("[EC %"PRIu32"] " format, ferr_id, ##__VA_ARGS__) zlog_err_id(ferr_id, format, ##__VA_ARGS__)
#define flog_err_sys(ferr_id, format, ...) \ #define flog_err_sys(ferr_id, format, ...) \
flog_err(ferr_id, format, ##__VA_ARGS__) flog_err(ferr_id, format, ##__VA_ARGS__)

1
lib/log_int.h
View File

@ -36,6 +36,7 @@ struct zlog {
int facility; /* as per syslog facility */ int facility; /* as per syslog facility */
int record_priority; /* should messages logged through stdio include the int record_priority; /* should messages logged through stdio include the
priority of the message? */ priority of the message? */
int error_code;
int syslog_options; /* 2nd arg to openlog */ int syslog_options; /* 2nd arg to openlog */
int timestamp_precision; /* # of digits of subsecond precision */ int timestamp_precision; /* # of digits of subsecond precision */
}; };