summaryrefslogtreecommitdiff
path: root/merge/src/merge_util.erl
diff options
context:
space:
mode:
authorMagnus Ahltorp <map@kth.se>2017-03-02 00:27:59 +0100
committerMagnus Ahltorp <map@kth.se>2017-03-08 23:23:13 +0100
commit12e08090358383c5678417ae8929fca1f03ca8bc (patch)
tree160e002958b6523d8a0e9f71bccad5a77c018ce2 /merge/src/merge_util.erl
parent04f5784a9af4cf49dd8a08ff4c64035272cfd370 (diff)
Statusserver
Diffstat (limited to 'merge/src/merge_util.erl')
-rw-r--r--merge/src/merge_util.erl4
1 files changed, 4 insertions, 0 deletions
diff --git a/merge/src/merge_util.erl b/merge/src/merge_util.erl
index 7598e40..24eba60 100644
--- a/merge/src/merge_util.erl
+++ b/merge/src/merge_util.erl
@@ -12,14 +12,18 @@ request(DebugTag, URL) ->
request(DebugTag, URL, Headers, RequestBody) ->
case plop_httputil:request(DebugTag, URL, Headers, RequestBody) of
{error, Err} ->
+ statusreport:report_multi("merge_errors", URL, "http_error", list_to_binary(io_lib:format("~w", [Err]))),
throw({request_error, request, DebugTag, Err});
{failure, {none, StatusCode, none}, _RespHeaders, _Body} ->
+ statusreport:report_multi("merge_errors", URL, "http_error", StatusCode),
throw({request_error, failure, DebugTag, StatusCode});
{success, {_, StatusCode, _}, _, Body} when StatusCode == 200 ->
case (catch mochijson2:decode(Body)) of
{error, Err} ->
+ statusreport:report_multi("merge_errors", URL, "http_error", list_to_binary(Err)),
throw({request_error, decode, DebugTag, Err});
{struct, PropList} ->
+ statusreport:report_multi("merge_errors", URL, "http_error", 200),
{proplists:get_value(<<"result">>, PropList), PropList}
end
end.