summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/chttpd/src/chttpd.erl3
-rw-r--r--apps/fabric/src/fabric_util.erl3
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/chttpd/src/chttpd.erl b/apps/chttpd/src/chttpd.erl
index 7bad9be2..028cfcd7 100644
--- a/apps/chttpd/src/chttpd.erl
+++ b/apps/chttpd/src/chttpd.erl
@@ -113,8 +113,7 @@ handle_request(MochiReq) ->
?LOG_ERROR("attempted upload of invalid JSON ~s", [S]),
send_error(HttpReq, {bad_request, "invalid UTF-8 JSON"});
exit:{mochiweb_recv_error, E} ->
- ?LOG_INFO("mochiweb_recv_error: ~p", [E]),
- showroom_log:message(notice, LogForClosedSocket, []),
+ ?LOG_INFO(LogForClosedSocket ++ " - ~p", [E]),
exit(normal);
throw:Error ->
send_error(HttpReq, Error);
diff --git a/apps/fabric/src/fabric_util.erl b/apps/fabric/src/fabric_util.erl
index 639a32e7..da557504 100644
--- a/apps/fabric/src/fabric_util.erl
+++ b/apps/fabric/src/fabric_util.erl
@@ -5,6 +5,7 @@
-include("fabric.hrl").
-include_lib("mem3/include/mem3.hrl").
+-include_lib("couch/include/couch_db.hrl").
submit_jobs(Shards, EndPoint, ExtraArgs) ->
lists:map(fun(#shard{node=Node, name=ShardName} = Shard) ->
@@ -71,7 +72,7 @@ process_message(RefList, Keypos, Fun, Acc0, TimeoutRef, PerMsgTO) ->
Fun(Msg, {Worker, From}, Acc0)
end;
{rexi_DOWN, _RexiMonPid, ServerPid, Reason} = Msg ->
- showroom_log:message(alert, "rexi_DOWN ~p ~p", [ServerPid, Reason]),
+ ?LOG_ERROR("rexi_DOWN ~p ~p", [ServerPid, Reason]),
Fun(Msg, nil, Acc0)
after PerMsgTO ->
timeout