Commit 3565634198df104f1df3c6b247177b18906a12b2
2011-07-10T22:32:17
Show communication error once only on failure.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57
diff --git a/util.c b/util.c
index 52427a0..04f23b8 100644
--- a/util.c
+++ b/util.c
@@ -210,6 +210,8 @@ out:
return ptrlen;
}
+static bool comms_error = false;
+
json_t *json_rpc_call(CURL *curl, const char *url,
const char *userpass, const char *rpc_req,
bool longpoll_scan, bool longpoll)
@@ -274,7 +276,9 @@ json_t *json_rpc_call(CURL *curl, const char *url,
rc = curl_easy_perform(curl);
if (rc) {
- applog(LOG_ERR, "HTTP request failed: %s", curl_err_str);
+ if (!comms_error)
+ applog(LOG_ERR, "HTTP request failed: %s", curl_err_str);
+ comms_error = true;
goto err_out;
}
@@ -288,10 +292,12 @@ json_t *json_rpc_call(CURL *curl, const char *url,
val = JSON_LOADS(all_data.buf, &err);
if (!val) {
- applog(LOG_ERR, "JSON decode failed(%d): %s", err.line, err.text);
+ if (!comms_error)
+ applog(LOG_ERR, "JSON decode failed(%d): %s", err.line, err.text);
+ comms_error = true;
if (opt_protocol)
- applog(LOG_DEBUG, "JSON protocol response:\n%s", all_data.buf);
+ applog(LOG_DEBUG, "JSON protocol response:\n%s", all_data.buf);
goto err_out;
}
@@ -317,13 +323,16 @@ json_t *json_rpc_call(CURL *curl, const char *url,
else
s = strdup("(unknown reason)");
- applog(LOG_ERR, "JSON-RPC call failed: %s", s);
+ if (!comms_error)
+ applog(LOG_ERR, "JSON-RPC call failed: %s", s);
+ comms_error = true;
free(s);
goto err_out;
}
+ comms_error = false;
databuf_free(&all_data);
curl_slist_free_all(headers);
curl_easy_reset(curl);