Many places in amf code the debug info is logged with LOG_EMERG, which is not
quite informative at emergency level. These should be moved to LOG_ERR level.
The fix is to change the LOG_EM to the LOG_ER level.
---
src/amf/amfd/ndfsm.cc | 2 +-
src/amf/amfd/ndproc.cc | 8 +++---
src/amf/amfd/role.cc | 8 +++---
src/amf/amfd/sg_2n_fsm.cc | 50 +++++++++++++++++-----------------
src/amf/amfd/sg_nored_fsm.cc | 36 ++++++++++++------------
src/amf/amfd/sg_npm_fsm.cc | 40 +++++++++++++--------------
src/amf/amfd/sg_nway_fsm.cc | 18 ++++++------
src/amf/amfd/sg_nwayact_fsm.cc | 32 +++++++++++-----------
src/amf/amfd/timer.cc | 4 +--
src/amf/amfd/util.cc | 16 +++++------
10 files changed, 107 insertions(+), 107 deletions(-)
diff --git a/src/amf/amfd/ndfsm.cc b/src/amf/amfd/ndfsm.cc
index e2235b2e9..674ef863a 100644
--- a/src/amf/amfd/ndfsm.cc
+++ b/src/amf/amfd/ndfsm.cc
@@ -1145,7 +1145,7 @@ uint32_t avd_node_down(AVD_CL_CB *cb, SaClmNodeIdT
node_id) {
if ((avnd = avd_node_find_nodeid(node_id)) == nullptr) {
/* log error that the node id is invalid */
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, node_id);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, node_id);
return NCSCC_RC_FAILURE;
}
diff --git a/src/amf/amfd/ndproc.cc b/src/amf/amfd/ndproc.cc
index 0d30dfe71..29c574167 100644
--- a/src/amf/amfd/ndproc.cc
+++ b/src/amf/amfd/ndproc.cc
@@ -202,7 +202,7 @@ void avd_reg_su_evh(AVD_CL_CB *cb, AVD_EVT *evt) {
/* log an error since this shouldn't happen */
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, n2d_msg->msg_info.n2d_reg_su.error);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, n2d_msg->msg_info.n2d_reg_su.error);
/* call the routine to failover all the effected nodes
* due to restarting this node
@@ -1041,7 +1041,7 @@ void avd_data_update_req_evh(AVD_CL_CB *cb, AVD_EVT *evt)
{
break;
default:
/* log error that a the object value is invalid */
- LOG_EM("%s:%u: %u", __FILE__, __LINE__,
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__,
n2d_msg->msg_info.n2d_data_req.param_info.attr_id);
break;
} /* switch(n2d_msg->msg_info.n2d_data_req.param_info.obj_id) */
@@ -1168,7 +1168,7 @@ void avd_data_update_req_evh(AVD_CL_CB *cb, AVD_EVT *evt)
{
break;
default:
/* log error that a the object value is invalid */
- LOG_EM("%s:%u: %u", __FILE__, __LINE__,
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__,
n2d_msg->msg_info.n2d_data_req.param_info.attr_id);
break;
} /* switch(n2d_msg->msg_info.n2d_data_req.param_info.obj_id) */
@@ -1177,7 +1177,7 @@ void avd_data_update_req_evh(AVD_CL_CB *cb, AVD_EVT *evt)
{
}
default:
/* log error that a the table value is invalid */
- LOG_EM("%s:%u: %u", __FILE__, __LINE__,
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__,
n2d_msg->msg_info.n2d_data_req.param_info.class_id);
goto done;
break;
diff --git a/src/amf/amfd/role.cc b/src/amf/amfd/role.cc
index 15b0458d2..24374de7c 100644
--- a/src/amf/amfd/role.cc
+++ b/src/amf/amfd/role.cc
@@ -598,7 +598,7 @@ static uint32_t avd_role_failover_qsd_actv(AVD_CL_CB *cb,
SaAmfHAStateT role) {
do node down processing for other node */
avd_node_mark_absent(avnd_other);
} else {
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, NCSCC_RC_FAILURE);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, NCSCC_RC_FAILURE);
}
return NCSCC_RC_SUCCESS;
@@ -701,7 +701,7 @@ void avd_role_switch_ncs_su_evh(AVD_CL_CB *cb, AVD_EVT
*evt) {
/* get the avnd from node_id */
if (nullptr == (avnd = avd_node_find_nodeid(cb->node_id_avd))) {
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, cb->node_id_avd);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, cb->node_id_avd);
return;
}
other_avnd = avd_node_find_nodeid(cb->node_id_avd_other);
@@ -852,12 +852,12 @@ try_again:
if (NCSCC_RC_SUCCESS !=
(status = avsv_set_ckpt_role(cb, SA_AMF_HA_QUIESCED))) {
/* Log error */
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, status);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, status);
}
/* Now Dispatch all the messages from the MBCSv mail-box */
if (NCSCC_RC_SUCCESS != (rc = avsv_mbcsv_dispatch(cb, SA_DISPATCH_ALL))) {
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, cb->node_id_avd_other);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, cb->node_id_avd_other);
cb->swap_switch = false;
return;
}
diff --git a/src/amf/amfd/sg_2n_fsm.cc b/src/amf/amfd/sg_2n_fsm.cc
index e38288db7..525e30049 100644
--- a/src/amf/amfd/sg_2n_fsm.cc
+++ b/src/amf/amfd/sg_2n_fsm.cc
@@ -1472,7 +1472,7 @@ uint32_t SG_2N::su_fault(AVD_CL_CB *cb, AVD_SU *su) {
break; /* case AVD_SG_FSM_SG_ADMIN: */
default:
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, su->sg_of_su->sg_fsm_state);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, su->sg_of_su->sg_fsm_state);
break;
} /* switch(su->sg_of_su->sg_fsm_state) */
@@ -1537,7 +1537,7 @@ uint32_t SG_2N::susi_success_sg_realign(AVD_SU *su,
AVD_SU_SI_REL *susi,
m_AVD_CHK_OPLIST(su, flag);
if (flag == false) {
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
goto done;
}
@@ -1816,8 +1816,8 @@ uint32_t SG_2N::susi_success_sg_realign(AVD_SU *su,
AVD_SU_SI_REL *susi,
avd_cb->active_services_exist = true;
}
} else {
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, act);
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, state);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, act);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, state);
LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
goto done;
@@ -1944,8 +1944,8 @@ uint32_t SG_2N::susi_success_sg_realign(AVD_SU *su,
AVD_SU_SI_REL *susi,
}
goto done;
} else {
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, state);
- LOG_EM("%s:%u: %s ", __FILE__, __LINE__, su->name.c_str());
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, state);
+ LOG_ER("%s:%u: %s ", __FILE__, __LINE__, su->name.c_str());
}
}
@@ -2443,17 +2443,17 @@ uint32_t SG_2N::susi_success_si_oper(AVD_SU *su,
AVD_SU_SI_REL *susi,
} /* if ((act == AVSV_SUSI_ACT_DEL) && (susi->state == SA_AMF_HA_QUIESCED))
*/
else {
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, susi->si->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, susi->si->name.c_str(),
susi->si->name.length());
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, su->sg_of_su->sg_fsm_state);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, su->sg_of_su->sg_fsm_state);
}
} else { /* if (susi != AVD_SU_SI_REL_NULL) */
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, su->sg_of_su->sg_fsm_state);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, su->sg_of_su->sg_fsm_state);
goto done;
} /* else (susi != AVD_SU_SI_REL_NULL) */
@@ -2485,7 +2485,7 @@ uint32_t SG_2N::susi_success(AVD_CL_CB *cb, AVD_SU *su,
AVD_SU_SI_REL *susi,
m_AVD_SU_SI_TRG_DEL(cb, susi);
}
}
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
break; /* case AVD_SG_FSM_STABLE: */
case AVD_SG_FSM_SG_REALIGN:
@@ -2556,8 +2556,8 @@ uint32_t SG_2N::susi_success(AVD_CL_CB *cb, AVD_SU *su,
AVD_SU_SI_REL *susi,
}
}
} else {
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, ((uint32_t)act));
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, ((uint32_t)act));
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
goto done;
}
@@ -2666,8 +2666,8 @@ uint32_t SG_2N::susi_success(AVD_CL_CB *cb, AVD_SU *su,
AVD_SU_SI_REL *susi,
}
}
} else {
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, ((uint32_t)act));
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, ((uint32_t)act));
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
goto done;
}
@@ -2675,9 +2675,9 @@ uint32_t SG_2N::susi_success(AVD_CL_CB *cb, AVD_SU *su,
AVD_SU_SI_REL *susi,
/* if (su->sg_of_su->admin_state == NCS_ADMIN_STATE_SHUTDOWN) */
break; /* case AVD_SG_FSM_SG_ADMIN: */
default:
- LOG_EM("%s:%u: %u", __FILE__, __LINE__,
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__,
((uint32_t)su->sg_of_su->sg_fsm_state));
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
goto done;
break;
@@ -2712,7 +2712,7 @@ uint32_t SG_2N::susi_failed(AVD_CL_CB *cb, AVD_SU *su,
AVD_SU_SI_REL *susi,
}
}
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
break; /* case AVD_SG_FSM_STABLE: */
case AVD_SG_FSM_SG_REALIGN:
@@ -2946,9 +2946,9 @@ uint32_t SG_2N::susi_failed(AVD_CL_CB *cb, AVD_SU *su,
AVD_SU_SI_REL *susi,
break; /* case AVD_SG_FSM_SG_ADMIN: */
default:
- LOG_EM("%s:%u: %u", __FILE__, __LINE__,
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__,
((uint32_t)su->sg_of_su->sg_fsm_state));
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
goto done;
break;
@@ -3720,9 +3720,9 @@ void SG_2N::node_fail(AVD_CL_CB *cb, AVD_SU *su) {
/* if (su->sg_of_su->admin_state == NCS_ADMIN_STATE_SHUTDOWN) */
break; /* case AVD_SG_FSM_SG_ADMIN: */
default:
- LOG_EM("%s:%u: %u", __FILE__, __LINE__,
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__,
((uint32_t)su->sg_of_su->sg_fsm_state));
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
goto done;
break;
@@ -4109,8 +4109,8 @@ uint32_t SG_2N::sg_admin_down(AVD_CL_CB *cb, AVD_SG *sg) {
} /* if (sg->admin_state == NCS_ADMIN_STATE_LOCK) */
break; /* case AVD_SG_FSM_SG_ADMIN: */
default:
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, ((uint32_t)sg->sg_fsm_state));
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, sg->name.c_str(),
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, ((uint32_t)sg->sg_fsm_state));
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, sg->name.c_str(),
sg->name.length());
goto done;
break;
diff --git a/src/amf/amfd/sg_nored_fsm.cc b/src/amf/amfd/sg_nored_fsm.cc
index 0f13874b4..edfd7591f 100644
--- a/src/amf/amfd/sg_nored_fsm.cc
+++ b/src/amf/amfd/sg_nored_fsm.cc
@@ -293,7 +293,7 @@ uint32_t SG_NORED::su_fault(AVD_CL_CB *cb, AVD_SU *su) {
break; /* case AVD_SG_FSM_SG_ADMIN: */
default:
/* log fatal error about the invalid value */
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, su->sg_of_su->sg_fsm_state);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, su->sg_of_su->sg_fsm_state);
return NCSCC_RC_FAILURE;
break;
} /* switch(su->sg_of_su->sg_fsm_state) */
@@ -307,7 +307,7 @@ uint32_t SG_NORED::su_insvc(AVD_CL_CB *cb, AVD_SU *su) {
/* An SU will not become in service when the SG is being locked or shutdown.
*/
if (su->sg_of_su->sg_fsm_state == AVD_SG_FSM_SG_ADMIN) {
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, su->sg_of_su->sg_fsm_state);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, su->sg_of_su->sg_fsm_state);
return NCSCC_RC_FAILURE;
}
@@ -350,7 +350,7 @@ uint32_t SG_NORED::susi_success(AVD_CL_CB *cb, AVD_SU *su,
AVD_SU_SI_REL *susi,
m_AVD_SU_SI_TRG_DEL(cb, su->list_of_susi);
}
/* log informational error. */
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
break; /* case AVD_SG_FSM_STABLE: */
case AVD_SG_FSM_SG_REALIGN:
@@ -477,9 +477,9 @@ uint32_t SG_NORED::susi_success(AVD_CL_CB *cb, AVD_SU *su,
AVD_SU_SI_REL *susi,
return NCSCC_RC_FAILURE;
if (su_oper_list_front() != su) {
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__,
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__,
su->list_of_susi->si->name.c_str(),
su->list_of_susi->si->name.length());
@@ -555,9 +555,9 @@ uint32_t SG_NORED::susi_success(AVD_CL_CB *cb, AVD_SU *su,
AVD_SU_SI_REL *susi,
return NCSCC_RC_FAILURE;
if (su->sg_of_su->admin_si != su->list_of_susi->si) {
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__,
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__,
su->list_of_susi->si->name.c_str(),
su->list_of_susi->si->name.length());
@@ -613,9 +613,9 @@ uint32_t SG_NORED::susi_success(AVD_CL_CB *cb, AVD_SU *su,
AVD_SU_SI_REL *susi,
/* if (state == SA_AMF_HA_QUIESCED) */
break; /* case AVD_SG_FSM_SG_ADMIN: */
default:
- LOG_EM("%s:%u: %u", __FILE__, __LINE__,
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__,
((uint32_t)su->sg_of_su->sg_fsm_state));
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
return NCSCC_RC_FAILURE;
break;
@@ -634,7 +634,7 @@ uint32_t SG_NORED::susi_failed(AVD_CL_CB *cb, AVD_SU *su,
AVD_SU_SI_REL *susi,
case AVD_SG_FSM_STABLE:
/* log fatal error. */
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
break; /* case AVD_SG_FSM_STABLE: */
case AVD_SG_FSM_SG_REALIGN:
@@ -728,9 +728,9 @@ uint32_t SG_NORED::susi_failed(AVD_CL_CB *cb, AVD_SU *su,
AVD_SU_SI_REL *susi,
return NCSCC_RC_FAILURE;
if (su->sg_of_su->admin_si != su->list_of_susi->si) {
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__,
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__,
su->list_of_susi->si->name.c_str(),
su->list_of_susi->si->name.length());
@@ -762,9 +762,9 @@ uint32_t SG_NORED::susi_failed(AVD_CL_CB *cb, AVD_SU *su,
AVD_SU_SI_REL *susi,
(state == SA_AMF_HA_QUIESCING))) */
break; /* case AVD_SG_FSM_SG_ADMIN: */
default:
- LOG_EM("%s:%u: %u", __FILE__, __LINE__,
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__,
((uint32_t)su->sg_of_su->sg_fsm_state));
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
return NCSCC_RC_FAILURE;
break;
@@ -983,9 +983,9 @@ void SG_NORED::node_fail(AVD_CL_CB *cb, AVD_SU *su) {
break; /* case AVD_SG_FSM_SG_ADMIN: */
default:
- LOG_EM("%s:%u: %u", __FILE__, __LINE__,
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__,
((uint32_t)su->sg_of_su->sg_fsm_state));
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
return;
break;
@@ -1185,8 +1185,8 @@ uint32_t SG_NORED::sg_admin_down(AVD_CL_CB *cb, AVD_SG
*sg) {
} /* if (sg->admin_state == NCS_ADMIN_STATE_LOCK) */
break; /* case AVD_SG_FSM_SG_ADMIN: */
default:
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, ((uint32_t)sg->sg_fsm_state));
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, sg->name.c_str(),
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, ((uint32_t)sg->sg_fsm_state));
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, sg->name.c_str(),
sg->name.length());
return NCSCC_RC_FAILURE;
break;
diff --git a/src/amf/amfd/sg_npm_fsm.cc b/src/amf/amfd/sg_npm_fsm.cc
index 0e91eb5eb..fad0a4369 100644
--- a/src/amf/amfd/sg_npm_fsm.cc
+++ b/src/amf/amfd/sg_npm_fsm.cc
@@ -1533,7 +1533,7 @@ uint32_t SG_NPM::su_fault(AVD_CL_CB *cb, AVD_SU *su) {
break; /* case AVD_SG_FSM_SG_ADMIN: */
default:
/* log fatal error about the invalid value */
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, su->sg_of_su->sg_fsm_state);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, su->sg_of_su->sg_fsm_state);
return NCSCC_RC_FAILURE;
break;
} /* switch(su->sg_of_su->sg_fsm_state) */
@@ -1547,7 +1547,7 @@ uint32_t SG_NPM::su_insvc(AVD_CL_CB *cb, AVD_SU *su) {
/* An SU will not become in service when the SG is being locked or shutdown.
*/
if (su->sg_of_su->sg_fsm_state == AVD_SG_FSM_SG_ADMIN) {
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, su->sg_of_su->sg_fsm_state);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, su->sg_of_su->sg_fsm_state);
return NCSCC_RC_FAILURE;
}
@@ -1683,7 +1683,7 @@ uint32_t SG_NPM::susi_sucss_sg_reln(AVD_CL_CB *cb, AVD_SU
*su,
if (flag == false) {
/* Log fatal error */
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
return NCSCC_RC_FAILURE;
}
@@ -1719,7 +1719,7 @@ uint32_t SG_NPM::susi_sucss_sg_reln(AVD_CL_CB *cb, AVD_SU
*su,
if (flag == false) {
/* Log fatal error */
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
return NCSCC_RC_FAILURE;
}
@@ -2653,9 +2653,9 @@ uint32_t SG_NPM::susi_success_su_oper(AVD_CL_CB *cb,
AVD_SU *su,
/*remove all and SU is in the operation list */
if (su->list_of_susi->state != SA_AMF_HA_QUIESCED) {
/* log error */
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, su->sg_of_su->sg_fsm_state);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, su->sg_of_su->sg_fsm_state);
}
o_susi = avd_sg_npm_su_othr(cb, su);
@@ -2925,9 +2925,9 @@ static uint32_t avd_sg_npm_susi_sucss_si_oper(AVD_CL_CB
*cb, AVD_SU *su,
/* if (i_susi == AVD_SU_SI_REL_NULL) */
} /* if ((act == AVSV_SUSI_ACT_MOD) && (state == SA_AMF_HA_ACTIVE)) */
else {
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, su->sg_of_su->sg_fsm_state);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, su->sg_of_su->sg_fsm_state);
}
} /* else (susi != AVD_SU_SI_REL_NULL) */
TRACE_LEAVE();
@@ -2952,7 +2952,7 @@ uint32_t SG_NPM::susi_success(AVD_CL_CB *cb, AVD_SU *su,
AVD_SU_SI_REL *susi,
}
}
/* log informational error. */
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
break; /* case AVD_SG_FSM_STABLE: */
case AVD_SG_FSM_SG_REALIGN:
@@ -3026,17 +3026,17 @@ uint32_t SG_NPM::susi_success(AVD_CL_CB *cb, AVD_SU
*su, AVD_SU_SI_REL *susi,
} /* else if ((susi == AVD_SU_SI_REL_NULL) && (act == AVSV_SUSI_ACT_DEL))
*/
else {
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, ((uint32_t)act));
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, ((uint32_t)act));
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
return NCSCC_RC_FAILURE;
}
break; /* case AVD_SG_FSM_SG_ADMIN: */
default:
- LOG_EM("%s:%u: %u", __FILE__, __LINE__,
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__,
((uint32_t)su->sg_of_su->sg_fsm_state));
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
return NCSCC_RC_FAILURE;
break;
@@ -3067,7 +3067,7 @@ uint32_t SG_NPM::susi_failed(AVD_CL_CB *cb, AVD_SU *su,
AVD_SU_SI_REL *susi,
}
/* log fatal error. */
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
break; /* case AVD_SG_FSM_STABLE: */
case AVD_SG_FSM_SG_REALIGN:
@@ -3265,9 +3265,9 @@ uint32_t SG_NPM::susi_failed(AVD_CL_CB *cb, AVD_SU *su,
AVD_SU_SI_REL *susi,
break; /* case AVD_SG_FSM_SG_ADMIN: */
default:
- LOG_EM("%s:%u: %u", __FILE__, __LINE__,
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__,
((uint32_t)su->sg_of_su->sg_fsm_state));
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
return NCSCC_RC_FAILURE;
break;
@@ -4323,9 +4323,9 @@ void SG_NPM::node_fail(AVD_CL_CB *cb, AVD_SU *su) {
break; /* case AVD_SG_FSM_SG_ADMIN: */
default:
- LOG_EM("%s:%u: %u", __FILE__, __LINE__,
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__,
((uint32_t)su->sg_of_su->sg_fsm_state));
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
return;
break;
@@ -4585,8 +4585,8 @@ uint32_t SG_NPM::sg_admin_down(AVD_CL_CB *cb, AVD_SG *sg)
{
} /* if (sg->admin_state == NCS_ADMIN_STATE_LOCK) */
break; /* case AVD_SG_FSM_SG_ADMIN: */
default:
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, ((uint32_t)sg->sg_fsm_state));
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, sg->name.c_str(),
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, ((uint32_t)sg->sg_fsm_state));
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, sg->name.c_str(),
sg->name.length());
return NCSCC_RC_FAILURE;
break;
diff --git a/src/amf/amfd/sg_nway_fsm.cc b/src/amf/amfd/sg_nway_fsm.cc
index 2c17b5a9e..02d160f3b 100644
--- a/src/amf/amfd/sg_nway_fsm.cc
+++ b/src/amf/amfd/sg_nway_fsm.cc
@@ -211,7 +211,7 @@ uint32_t SG_NWAY::su_fault(AVD_CL_CB *cb, AVD_SU *su) {
break;
default:
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, su->sg_of_su->sg_fsm_state);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, su->sg_of_su->sg_fsm_state);
rc = NCSCC_RC_FAILURE;
} /* switch */
@@ -228,7 +228,7 @@ uint32_t SG_NWAY::su_insvc(AVD_CL_CB *cb, AVD_SU *su) {
/* An SU will not become in service when the SG is being locked or shutdown.
*/
if (su->sg_of_su->sg_fsm_state == AVD_SG_FSM_SG_ADMIN) {
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, su->sg_of_su->sg_fsm_state);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, su->sg_of_su->sg_fsm_state);
rc = NCSCC_RC_FAILURE;
goto done;
}
@@ -283,7 +283,7 @@ uint32_t SG_NWAY::susi_success(AVD_CL_CB *cb, AVD_SU *su,
AVD_SU_SI_REL *susi,
break;
default:
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, su->sg_of_su->sg_fsm_state);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, su->sg_of_su->sg_fsm_state);
rc = NCSCC_RC_FAILURE;
goto done;
} /* switch */
@@ -442,9 +442,9 @@ uint32_t SG_NWAY::susi_failed(AVD_CL_CB *cb, AVD_SU *su,
AVD_SU_SI_REL *susi,
break;
default:
- LOG_EM("%s:%u: %u", __FILE__, __LINE__,
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__,
((uint32_t)su->sg_of_su->sg_fsm_state));
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
rc = NCSCC_RC_FAILURE;
} /* switch */
@@ -510,9 +510,9 @@ void SG_NWAY::node_fail(AVD_CL_CB *cb, AVD_SU *su) {
break;
default:
- LOG_EM("%s:%u: %u", __FILE__, __LINE__,
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__,
((uint32_t)su->sg_of_su->sg_fsm_state));
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
goto done;
} /* switch */
@@ -788,8 +788,8 @@ uint32_t SG_NWAY::sg_admin_down(AVD_CL_CB *cb, AVD_SG *sg) {
break;
default:
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, ((uint32_t)sg->sg_fsm_state));
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, sg->name.c_str(),
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, ((uint32_t)sg->sg_fsm_state));
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, sg->name.c_str(),
sg->name.length());
rc = NCSCC_RC_FAILURE;
} /* switch */
diff --git a/src/amf/amfd/sg_nwayact_fsm.cc b/src/amf/amfd/sg_nwayact_fsm.cc
index 364176125..1fb497ac2 100644
--- a/src/amf/amfd/sg_nwayact_fsm.cc
+++ b/src/amf/amfd/sg_nwayact_fsm.cc
@@ -560,7 +560,7 @@ uint32_t SG_NACV::su_fault(AVD_CL_CB *cb, AVD_SU *su) {
break; /* case AVD_SG_FSM_SG_ADMIN: */
default:
/* log fatal error about the invalid value */
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, su->sg_of_su->sg_fsm_state);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, su->sg_of_su->sg_fsm_state);
return NCSCC_RC_FAILURE;
break;
} /* switch(su->sg_of_su->sg_fsm_state) */
@@ -574,7 +574,7 @@ uint32_t SG_NACV::su_insvc(AVD_CL_CB *cb, AVD_SU *su) {
/* An SU will not become in service when the SG is being locked or shutdown.
*/
if (su->sg_of_su->sg_fsm_state == AVD_SG_FSM_SG_ADMIN) {
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, su->sg_of_su->sg_fsm_state);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, su->sg_of_su->sg_fsm_state);
return NCSCC_RC_FAILURE;
}
@@ -629,7 +629,7 @@ uint32_t SG_NACV::susi_success(AVD_CL_CB *cb, AVD_SU *su,
AVD_SU_SI_REL *susi,
}
}
/* log informational error. */
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
break; /* case AVD_SG_FSM_STABLE: */
case AVD_SG_FSM_SG_REALIGN:
@@ -948,9 +948,9 @@ uint32_t SG_NACV::susi_success(AVD_CL_CB *cb, AVD_SU *su,
AVD_SU_SI_REL *susi,
}
if (su_oper_list_front() != su) {
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__,
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__,
su->list_of_susi->si->name.c_str(),
su->list_of_susi->si->name.length());
@@ -1094,9 +1094,9 @@ uint32_t SG_NACV::susi_success(AVD_CL_CB *cb, AVD_SU *su,
AVD_SU_SI_REL *susi,
/* if (state == SA_AMF_HA_QUIESCED) */
break; /* case AVD_SG_FSM_SG_ADMIN: */
default:
- LOG_EM("%s:%u: %u", __FILE__, __LINE__,
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__,
((uint32_t)su->sg_of_su->sg_fsm_state));
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
return NCSCC_RC_FAILURE;
break;
@@ -1116,7 +1116,7 @@ uint32_t SG_NACV::susi_failed(AVD_CL_CB *cb, AVD_SU *su,
AVD_SU_SI_REL *susi,
case AVD_SG_FSM_STABLE:
/* log fatal error. */
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
break; /* case AVD_SG_FSM_STABLE: */
case AVD_SG_FSM_SG_REALIGN:
@@ -1239,9 +1239,9 @@ uint32_t SG_NACV::susi_failed(AVD_CL_CB *cb, AVD_SU *su,
AVD_SU_SI_REL *susi,
}
if (su_oper_list_front() != su) {
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__,
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__,
su->list_of_susi->si->name.c_str(),
su->list_of_susi->si->name.length());
@@ -1318,9 +1318,9 @@ uint32_t SG_NACV::susi_failed(AVD_CL_CB *cb, AVD_SU *su,
AVD_SU_SI_REL *susi,
(state == SA_AMF_HA_QUIESCING))) */
break; /* case AVD_SG_FSM_SG_ADMIN: */
default:
- LOG_EM("%s:%u: %u", __FILE__, __LINE__,
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__,
((uint32_t)su->sg_of_su->sg_fsm_state));
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
return NCSCC_RC_FAILURE;
break;
@@ -1622,9 +1622,9 @@ void SG_NACV::node_fail(AVD_CL_CB *cb, AVD_SU *su) {
break; /* case AVD_SG_FSM_SG_ADMIN: */
default:
- LOG_EM("%s:%u: %u", __FILE__, __LINE__,
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__,
((uint32_t)su->sg_of_su->sg_fsm_state));
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, su->name.c_str(),
su->name.length());
return;
break;
@@ -1878,8 +1878,8 @@ uint32_t SG_NACV::sg_admin_down(AVD_CL_CB *cb, AVD_SG
*sg) {
} /* if (sg->admin_state == NCS_ADMIN_STATE_LOCK) */
break; /* case AVD_SG_FSM_SG_ADMIN: */
default:
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, ((uint32_t)sg->sg_fsm_state));
- LOG_EM("%s:%u: %s (%zu)", __FILE__, __LINE__, sg->name.c_str(),
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, ((uint32_t)sg->sg_fsm_state));
+ LOG_ER("%s:%u: %s (%zu)", __FILE__, __LINE__, sg->name.c_str(),
sg->name.length());
return NCSCC_RC_FAILURE;
break;
diff --git a/src/amf/amfd/timer.cc b/src/amf/amfd/timer.cc
index cb7d52de9..9f6c986d4 100644
--- a/src/amf/amfd/timer.cc
+++ b/src/amf/amfd/timer.cc
@@ -67,7 +67,7 @@ uint32_t avd_start_tmr(AVD_CL_CB *cb, AVD_TMR *tmr, SaTimeT
period) {
tmr_period = (period / AVSV_NANOSEC_TO_LEAPTM);
if (AVD_TMR_MAX <= tmr->type) {
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, tmr->type);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, tmr->type);
TRACE_LEAVE();
return NCSCC_RC_FAILURE;
}
@@ -113,7 +113,7 @@ void avd_stop_tmr(AVD_CL_CB *cb, AVD_TMR *tmr) {
/* If timer type is invalid just return */
if (AVD_TMR_MAX <= tmr->type) {
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, tmr->type);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, tmr->type);
TRACE_LEAVE();
return;
}
diff --git a/src/amf/amfd/util.cc b/src/amf/amfd/util.cc
index bcd7bdc6c..f2b3c5f2a 100644
--- a/src/amf/amfd/util.cc
+++ b/src/amf/amfd/util.cc
@@ -149,7 +149,7 @@ uint32_t avd_snd_node_data_verify_msg(AVD_CL_CB *cb,
AVD_AVND *avnd) {
*/
/* Log a fatal error that node record can't be null */
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, 0);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, 0);
return NCSCC_RC_FAILURE;
}
@@ -209,7 +209,7 @@ uint32_t avd_snd_node_up_msg(AVD_CL_CB *cb, AVD_AVND *avnd,
*/
/* Log a fatal error that node record can't be null */
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, 0);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, 0);
return NCSCC_RC_FAILURE;
}
@@ -268,7 +268,7 @@ uint32_t avd_snd_oper_state_msg(AVD_CL_CB *cb, AVD_AVND
*avnd,
*/
/* Log a fatal error that AvND record can't be null */
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, 0);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, 0);
return NCSCC_RC_FAILURE;
}
@@ -788,7 +788,7 @@ uint32_t avd_snd_susi_msg(AVD_CL_CB *cb, AVD_SU *su,
AVD_SU_SI_REL *susi,
/* log fatal error. This call for assignments has to be
* called with a valid SU SI relationship value.
*/
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, 0);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, 0);
/* free the SUSI message */
d2n_msg_free(susi_msg);
TRACE_LEAVE();
@@ -817,7 +817,7 @@ uint32_t avd_snd_susi_msg(AVD_CL_CB *cb, AVD_SU *su,
AVD_SU_SI_REL *susi,
/* log fatal error. This call for assignments has to be
* called with a valid SU SI relationship value.
*/
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, 0);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, 0);
/* free the SUSI message */
d2n_msg_free(susi_msg);
TRACE_LEAVE();
@@ -844,7 +844,7 @@ uint32_t avd_snd_susi_msg(AVD_CL_CB *cb, AVD_SU *su,
AVD_SU_SI_REL *susi,
*/
/* Log a fatal error that it is an invalid action */
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, actn);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, actn);
d2n_msg_free(susi_msg);
TRACE_LEAVE();
return NCSCC_RC_FAILURE;
@@ -909,7 +909,7 @@ uint32_t avd_snd_susi_msg(AVD_CL_CB *cb, AVD_SU *su,
AVD_SU_SI_REL *susi,
if (actn == AVSV_SUSI_ACT_ASGN) {
if (avd_prep_csi_attr_info(cb, compcsi_info, l_compcsi) ==
NCSCC_RC_FAILURE) {
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, avnd->node_info.nodeId);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, avnd->node_info.nodeId);
d2n_msg_free(susi_msg);
TRACE_LEAVE();
return NCSCC_RC_FAILURE;
@@ -1212,7 +1212,7 @@ uint32_t avd_snd_set_leds_msg(AVD_CL_CB *cb, AVD_AVND
*avnd) {
*/
/* Log a fatal error that AvND record can't be null */
- LOG_EM("%s:%u: %u", __FILE__, __LINE__, 0);
+ LOG_ER("%s:%u: %u", __FILE__, __LINE__, 0);
TRACE_LEAVE();
return NCSCC_RC_FAILURE;
}
--
2.17.1
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
