summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--watchfrr/watchfrr.c10
-rw-r--r--watchfrr/watchfrr_errors.c2
-rw-r--r--watchfrr/watchfrr_errors.h2
3 files changed, 7 insertions, 7 deletions
diff --git a/watchfrr/watchfrr.c b/watchfrr/watchfrr.c
index 07a29ca6d5..326de1fc4a 100644
--- a/watchfrr/watchfrr.c
+++ b/watchfrr/watchfrr.c
@@ -493,7 +493,7 @@ static int wakeup_init(struct thread *t_wakeup)
dmn->t_wakeup = NULL;
if (try_connect(dmn) < 0) {
SET_WAKEUP_DOWN(dmn);
- flog_err(WATCHFRR_ERR_CONNECTION,
+ flog_err(EC_WATCHFRR_CONNECTION,
"%s state -> down : initial connection attempt failed",
dmn->name);
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)
{
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);
else if (gs.loglevel > LOG_DEBUG)
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)
{
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_str[gs.phase], PHASE_TIMEOUT);
gs.phase = PHASE_NONE;
@@ -867,7 +867,7 @@ static int wakeup_unresponsive(struct thread *t_wakeup)
dmn->t_wakeup = NULL;
if (dmn->state != DAEMON_UNRESPONSIVE)
- flog_err(WATCHFRR_ERR_CONNECTION,
+ flog_err(EC_WATCHFRR_CONNECTION,
"%s: no longer unresponsive (now %s), "
"wakeup should have been cancelled!",
dmn->name, state_str[dmn->state]);
@@ -884,7 +884,7 @@ static int wakeup_no_answer(struct thread *t_wakeup)
dmn->t_wakeup = NULL;
dmn->state = DAEMON_UNRESPONSIVE;
- flog_err(WATCHFRR_ERR_CONNECTION,
+ flog_err(EC_WATCHFRR_CONNECTION,
"%s state -> unresponsive : no response yet to ping "
"sent %ld seconds ago",
dmn->name, gs.timeout);
diff --git a/watchfrr/watchfrr_errors.c b/watchfrr/watchfrr_errors.c
index 662e7f654d..c720b65099 100644
--- a/watchfrr/watchfrr_errors.c
+++ b/watchfrr/watchfrr_errors.c
@@ -26,7 +26,7 @@
/* clang-format off */
static struct log_ref ferr_watchfrr_err[] = {
{
- .code = WATCHFRR_ERR_CONNECTION,
+ .code = EC_WATCHFRR_CONNECTION,
.title = "WATCHFRR Connection Error",
.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"
diff --git a/watchfrr/watchfrr_errors.h b/watchfrr/watchfrr_errors.h
index 4652f950f4..93103b6551 100644
--- a/watchfrr/watchfrr_errors.h
+++ b/watchfrr/watchfrr_errors.h
@@ -24,7 +24,7 @@
#include "lib/ferr.h"
enum watchfrr_log_refs {
- WATCHFRR_ERR_CONNECTION = WATCHFRR_FERR_START,
+ EC_WATCHFRR_CONNECTION = WATCHFRR_FERR_START,
};
extern void watchfrr_error_init(void);