Commit 5eb39bf8 authored by Geoff Simmons's avatar Geoff Simmons

trackrdrd: bugfix updating monitoring stats after recoverable and

           unrecoverable send errors
parent 81f2663d
...@@ -134,8 +134,10 @@ wrk_send(void **mq_worker, dataentry *entry, worker_data_t *wrk) ...@@ -134,8 +134,10 @@ wrk_send(void **mq_worker, dataentry *entry, worker_data_t *wrk)
if (errnum != 0) { if (errnum != 0) {
LOG_Log(LOG_WARNING, "Worker %d: Failed to send data: %s", LOG_Log(LOG_WARNING, "Worker %d: Failed to send data: %s",
wrk->id, err); wrk->id, err);
if (errnum > 0) if (errnum > 0) {
wrk->recoverables++; wrk->recoverables++;
MON_StatsUpdate(STATS_FAILED);
}
else { else {
/* Non-recoverable error */ /* Non-recoverable error */
LOG_Log(LOG_INFO, "Worker %d: Reconnecting", wrk->id); LOG_Log(LOG_INFO, "Worker %d: Reconnecting", wrk->id);
...@@ -146,6 +148,7 @@ wrk_send(void **mq_worker, dataentry *entry, worker_data_t *wrk) ...@@ -146,6 +148,7 @@ wrk_send(void **mq_worker, dataentry *entry, worker_data_t *wrk)
err); err);
LOG_Log(LOG_ERR, "Worker %d: Data DISCARDED [%.*s]", wrk->id, LOG_Log(LOG_ERR, "Worker %d: Data DISCARDED [%.*s]", wrk->id,
entry->end, entry->data); entry->end, entry->data);
MON_StatsUpdate(STATS_FAILED);
} }
else { else {
wrk->reconnects++; wrk->reconnects++;
...@@ -156,8 +159,10 @@ wrk_send(void **mq_worker, dataentry *entry, worker_data_t *wrk) ...@@ -156,8 +159,10 @@ wrk_send(void **mq_worker, dataentry *entry, worker_data_t *wrk)
if (errnum != 0) { if (errnum != 0) {
LOG_Log(LOG_WARNING, "Worker %d: Failed to send data " LOG_Log(LOG_WARNING, "Worker %d: Failed to send data "
"after reconnect: %s", wrk->id, err); "after reconnect: %s", wrk->id, err);
if (errnum > 0) if (errnum > 0) {
wrk->recoverables++; wrk->recoverables++;
MON_StatsUpdate(STATS_FAILED);
}
else { else {
/* Fail after reconnect, give up */ /* Fail after reconnect, give up */
wrk->fails++; wrk->fails++;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment