Convert from twig to couch_log
diff --git a/src/mango.app.src b/src/mango.app.src
index 7bd5d74..a25cf1e 100644
--- a/src/mango.app.src
+++ b/src/mango.app.src
@@ -18,7 +18,7 @@
kernel,
stdlib,
config,
- twig,
+ couch_log,
fabric
]}
]}.
diff --git a/src/mango_cursor_view.erl b/src/mango_cursor_view.erl
index d3d1db1..9e992f9 100644
--- a/src/mango_cursor_view.erl
+++ b/src/mango_cursor_view.erl
@@ -75,13 +75,11 @@
CB = fun ?MODULE:handle_message/2,
{ok, LastCursor} = case mango_idx:def(Idx) of
all_docs ->
- %twig:log(err, "Query: ~s all_docs~n ~p", [Db#db.name, Args]),
fabric:all_docs(Db, CB, Cursor, Args);
_ ->
% Normal view
DDoc = ddocid(Idx),
Name = mango_idx:name(Idx),
- %twig:log(err, "Query: ~s ~s ~s~n ~p", [Db#db.name, DDoc, Name, Args]),
fabric:query_view(Db, DDoc, Name, CB, Cursor, Args)
end,
{ok, LastCursor#cursor.user_acc}.
@@ -137,10 +135,8 @@
handle_message({total_and_offset, _, _} = _TO, Cursor) ->
- %twig:log(err, "TOTAL AND OFFSET: ~p", [_TO]),
{ok, Cursor};
handle_message({row, {Props}}, Cursor) ->
- %twig:log(err, "ROW: ~p", [Props]),
case doc_member(Cursor#cursor.db, Props, Cursor#cursor.opts) of
{ok, Doc} ->
case mango_selector:match(Cursor#cursor.selector, Doc) of
@@ -151,14 +147,12 @@
{ok, Cursor}
end;
Error ->
- twig:log(err, "~s :: Error loading doc: ~p", [?MODULE, Error]),
+ couch_log:error("~s :: Error loading doc: ~p", [?MODULE, Error]),
{ok, Cursor}
end;
handle_message(complete, Cursor) ->
- %twig:log(err, "COMPLETE", []),
{ok, Cursor};
handle_message({error, Reason}, _Cursor) ->
- %twig:log(err, "ERROR: ~p", [Reason]),
{error, Reason}.
diff --git a/src/mango_httpd.erl b/src/mango_httpd.erl
index ed1e9bc..2588a23 100644
--- a/src/mango_httpd.erl
+++ b/src/mango_httpd.erl
@@ -29,7 +29,6 @@
catch
throw:{mango_error, Module, Reason} ->
%Stack = erlang:get_stacktrace(),
- %twig:log(err, "Error: ~s :: ~w~n~p", [Module, Reason, Stack]),
{Code, ErrorStr, ReasonStr} = mango_error:info(Module, Reason),
Resp = {[
{<<"error">>, ErrorStr},
diff --git a/src/mango_util.erl b/src/mango_util.erl
index f350710..8e8ccb4 100644
--- a/src/mango_util.erl
+++ b/src/mango_util.erl
@@ -79,7 +79,6 @@
defer(Mod, Fun, Args) ->
- %twig:log(error, "MFA: ~p", [{Mod, Fun, Args}]),
{Pid, Ref} = erlang:spawn_monitor(?MODULE, do_defer, [Mod, Fun, Args]),
receive
{'DOWN', Ref, process, Pid, {mango_defer_ok, Value}} ->
@@ -100,15 +99,15 @@
catch
throw:Error ->
Stack = erlang:get_stacktrace(),
- twig:log(err, "Defered error: ~w~n ~p", [{throw, Error}, Stack]),
+ couch_log:error("Defered error: ~w~n ~p", [{throw, Error}, Stack]),
erlang:exit({mango_defer_throw, Error});
error:Error ->
Stack = erlang:get_stacktrace(),
- twig:log(err, "Defered error: ~w~n ~p", [{error, Error}, Stack]),
+ couch_log:error("Defered error: ~w~n ~p", [{error, Error}, Stack]),
erlang:exit({mango_defer_error, Error});
exit:Error ->
Stack = erlang:get_stacktrace(),
- twig:log(err, "Defered error: ~w~n ~p", [{exit, Error}, Stack]),
+ couch_log:error("Defered error: ~w~n ~p", [{exit, Error}, Stack]),
erlang:exit({mango_defer_exit, Error})
end.
