Commit b56ed74867bc42b09e920b3cd9946ec6d767e200
2011-07-19T23:06:11
When json rpc errors occur they occur in spits and starts, so trying to limit them with the comms error bool doesn't stop a flood of them appearing. Make the json errors LOG_INFO level instead so they don't normally show up.
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
diff --git a/util.c b/util.c
index 75ee5d4..36f644e 100644
--- a/util.c
+++ b/util.c
@@ -242,8 +242,6 @@ 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 probe, bool longpoll,
@@ -310,9 +308,7 @@ json_t *json_rpc_call(CURL *curl, const char *url,
rc = curl_easy_perform(curl);
if (rc) {
- if (!comms_error)
- applog(LOG_INFO, "HTTP request failed: %s", curl_err_str);
- comms_error = true;
+ applog(LOG_INFO, "HTTP request failed: %s", curl_err_str);
goto err_out;
}
@@ -340,9 +336,7 @@ json_t *json_rpc_call(CURL *curl, const char *url,
val = JSON_LOADS(all_data.buf, &err);
if (!val) {
- if (!comms_error)
- applog(LOG_ERR, "JSON decode failed(%d): %s", err.line, err.text);
- comms_error = true;
+ applog(LOG_INFO, "JSON decode failed(%d): %s", err.line, err.text);
if (opt_protocol)
applog(LOG_DEBUG, "JSON protocol response:\n%s", all_data.buf);
@@ -371,9 +365,7 @@ json_t *json_rpc_call(CURL *curl, const char *url,
else
s = strdup("(unknown reason)");
- if (!comms_error)
- applog(LOG_ERR, "JSON-RPC call failed: %s", s);
- comms_error = true;
+ applog(LOG_INFO, "JSON-RPC call failed: %s", s);
free(s);
@@ -381,7 +373,6 @@ json_t *json_rpc_call(CURL *curl, const char *url,
}
successful_connect = true;
- comms_error = false;
databuf_free(&all_data);
curl_slist_free_all(headers);
curl_easy_reset(curl);