Avoid spamming the syslog with more than one log message in case CLM returns
SA_AIS_ERR_UNAVAILABLE (i.e. we are running on a currently unconfigured node).
---
src/amf/amfd/clm.cc | 6 ++++--
src/amf/amfnd/clm.cc | 6 ++++--
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/amf/amfd/clm.cc b/src/amf/amfd/clm.cc
index 86c23ea46..da951d223 100644
--- a/src/amf/amfd/clm.cc
+++ b/src/amf/amfd/clm.cc
@@ -433,13 +433,15 @@ SaAisErrorT avd_clm_init(AVD_CL_CB *cb) {
* BAD_HANDLE. Also, duplicated codes in initialization thread
* will be moved to osaf dedicated thread
*/
+ bool has_logged_clm_error = false;
for (;;) {
SaVersionT Version = {'B', 4, 1};
error = saClmInitialize_4(&clm_handle, &clm_callbacks, &Version);
if (error == SA_AIS_ERR_TRY_AGAIN || error == SA_AIS_ERR_TIMEOUT ||
error == SA_AIS_ERR_UNAVAILABLE) {
- if (error != SA_AIS_ERR_TRY_AGAIN) {
- LOG_WA("saClmInitialize_4 returned %u", (unsigned)error);
+ if (error != SA_AIS_ERR_TRY_AGAIN && !has_logged_clm_error) {
+ LOG_WA("saClmInitialize_4 returned %u", static_cast<unsigned>(error));
+ has_logged_clm_error = true;
}
osaf_nanosleep(&kHundredMilliseconds);
continue;
diff --git a/src/amf/amfnd/clm.cc b/src/amf/amfnd/clm.cc
index 6985f3685..f1f65bcef 100644
--- a/src/amf/amfnd/clm.cc
+++ b/src/amf/amfnd/clm.cc
@@ -276,13 +276,15 @@ SaAisErrorT avnd_clm_init(AVND_CB *cb) {
cb->first_time_up = true;
cb->clmHandle = 0;
+ bool has_logged_clm_error = false;
for (;;) {
SaVersionT Version = {'B', 4, 1};
error = saClmInitialize_4(&cb->clmHandle, &callbacks, &Version);
if (error == SA_AIS_ERR_TRY_AGAIN || error == SA_AIS_ERR_TIMEOUT ||
error == SA_AIS_ERR_UNAVAILABLE) {
- if (error != SA_AIS_ERR_TRY_AGAIN) {
- LOG_WA("saClmInitialize_4 returned %u", (unsigned)error);
+ if (error != SA_AIS_ERR_TRY_AGAIN && !has_logged_clm_error) {
+ LOG_WA("saClmInitialize_4 returned %u", static_cast<unsigned>(error));
+ has_logged_clm_error = true;
}
osaf_nanosleep(&kHundredMilliseconds);
continue;
--
2.13.1
------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
Opensaf-devel mailing list
Opensaf-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/opensaf-devel
