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

watchfrr: WATCHFRR_[ERR|WARN] -> EC_WATCHFRR

Browse Source 
Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>
This commit is contained in:
Quentin Young 2018-09-13 19:16:02 +00:00
parent 993c8024ff
commit f74ae2bb41
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
watchfrr/watchfrr.c
View File

@ -493,7 +493,7 @@ static int wakeup_init(struct thread *t_wakeup)
dmn->t_wakeup = NULL; dmn->t_wakeup = NULL;
if (try_connect(dmn) < 0) { if (try_connect(dmn) < 0) {
SET_WAKEUP_DOWN(dmn); SET_WAKEUP_DOWN(dmn);
flog_err(WATCHFRR_ERR_CONNECTION, flog_err(EC_WATCHFRR_CONNECTION,
"%s state -> down : initial connection attempt failed", "%s state -> down : initial connection attempt failed",
dmn->name); dmn->name);
dmn->state = DAEMON_DOWN; dmn->state = DAEMON_DOWN;
@ -504,7 +504,7 @@ static int wakeup_init(struct thread *t_wakeup)
static void daemon_down(struct daemon *dmn, const char *why) static void daemon_down(struct daemon *dmn, const char *why)
{ {
if (IS_UP(dmn) || (dmn->state == DAEMON_INIT)) if (IS_UP(dmn) || (dmn->state == DAEMON_INIT))
flog_err(WATCHFRR_ERR_CONNECTION, flog_err(EC_WATCHFRR_CONNECTION,
"%s state -> down : %s", dmn->name, why); "%s state -> down : %s", dmn->name, why);
else if (gs.loglevel > LOG_DEBUG) else if (gs.loglevel > LOG_DEBUG)
zlog_debug("%s still down : %s", dmn->name, why); zlog_debug("%s still down : %s", dmn->name, why);
@ -751,7 +751,7 @@ static int try_connect(struct daemon *dmn)
static int phase_hanging(struct thread *t_hanging) static int phase_hanging(struct thread *t_hanging)
{ {
gs.t_phase_hanging = NULL; gs.t_phase_hanging = NULL;
flog_err(WATCHFRR_ERR_CONNECTION, flog_err(EC_WATCHFRR_CONNECTION,
"Phase [%s] hanging for %ld seconds, aborting phased restart", "Phase [%s] hanging for %ld seconds, aborting phased restart",
phase_str[gs.phase], PHASE_TIMEOUT); phase_str[gs.phase], PHASE_TIMEOUT);
gs.phase = PHASE_NONE; gs.phase = PHASE_NONE;
@ -867,7 +867,7 @@ static int wakeup_unresponsive(struct thread *t_wakeup)
dmn->t_wakeup = NULL; dmn->t_wakeup = NULL;
if (dmn->state != DAEMON_UNRESPONSIVE) if (dmn->state != DAEMON_UNRESPONSIVE)
flog_err(WATCHFRR_ERR_CONNECTION, flog_err(EC_WATCHFRR_CONNECTION,
"%s: no longer unresponsive (now %s), " "%s: no longer unresponsive (now %s), "
"wakeup should have been cancelled!", "wakeup should have been cancelled!",
dmn->name, state_str[dmn->state]); dmn->name, state_str[dmn->state]);
@ -884,7 +884,7 @@ static int wakeup_no_answer(struct thread *t_wakeup)
dmn->t_wakeup = NULL; dmn->t_wakeup = NULL;
dmn->state = DAEMON_UNRESPONSIVE; dmn->state = DAEMON_UNRESPONSIVE;
flog_err(WATCHFRR_ERR_CONNECTION, flog_err(EC_WATCHFRR_CONNECTION,
"%s state -> unresponsive : no response yet to ping " "%s state -> unresponsive : no response yet to ping "
"sent %ld seconds ago", "sent %ld seconds ago",
dmn->name, gs.timeout); dmn->name, gs.timeout);

2
watchfrr/watchfrr_errors.c
View File

@ -26,7 +26,7 @@
/* clang-format off */ /* clang-format off */
static struct log_ref ferr_watchfrr_err[] = { static struct log_ref ferr_watchfrr_err[] = {
{ {
.code = WATCHFRR_ERR_CONNECTION, .code = EC_WATCHFRR_CONNECTION,
.title = "WATCHFRR Connection Error", .title = "WATCHFRR Connection Error",
.description = "WATCHFRR has detected a connectivity issue with one of the FRR daemons", .description = "WATCHFRR has detected a connectivity issue with one of the FRR daemons",
.suggestion = "Ensure that FRR is still running and if not please open an Issue" .suggestion = "Ensure that FRR is still running and if not please open an Issue"

2
watchfrr/watchfrr_errors.h
View File

@ -24,7 +24,7 @@
#include "lib/ferr.h" #include "lib/ferr.h"
enum watchfrr_log_refs { enum watchfrr_log_refs {
WATCHFRR_ERR_CONNECTION = WATCHFRR_FERR_START, EC_WATCHFRR_CONNECTION = WATCHFRR_FERR_START,
}; };
extern void watchfrr_error_init(void); extern void watchfrr_error_init(void);