You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2016/07/25 17:28:08 UTC
[1/2] couch-log commit: updated refs/heads/master to 038586b
Repository: couchdb-couch-log
Updated Branches:
refs/heads/master da0e48964 -> 038586b7a
Add support for traces with an argument list
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-log/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-log/commit/b6eca222
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-log/tree/b6eca222
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-log/diff/b6eca222
Branch: refs/heads/master
Commit: b6eca222b0f96de91456f79cbca4667607aafe31
Parents: da0e489
Author: Paul J. Davis <pa...@gmail.com>
Authored: Mon Jul 25 12:26:28 2016 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Mon Jul 25 12:26:28 2016 -0500
----------------------------------------------------------------------
src/couch_log_formatter.erl | 8 ++++++++
1 file changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-log/blob/b6eca222/src/couch_log_formatter.erl
----------------------------------------------------------------------
diff --git a/src/couch_log_formatter.erl b/src/couch_log_formatter.erl
index a2c5305..089c80f 100644
--- a/src/couch_log_formatter.erl
+++ b/src/couch_log_formatter.erl
@@ -283,10 +283,18 @@ format_reason({Reason, [{M, F, A} | _] = Trace})
when is_atom(M), is_atom(F), is_integer(A) ->
[format_reason(Reason), " at ", format_trace(Trace)];
+format_reason({Reason, [{M, F, A} | _] = Trace})
+ when is_atom(M), is_atom(F), is_list(A) ->
+ [format_reason(Reason), " at ", format_trace(Trace)];
+
format_reason({Reason, [{M, F, A, Props} | _] = Trace})
when is_atom(M), is_atom(F), is_integer(A), is_list(Props) ->
[format_reason(Reason), " at ", format_trace(Trace)];
+format_reason({Reason, [{M, F, A, Props} | _] = Trace})
+ when is_atom(M), is_atom(F), is_list(A), is_list(Props) ->
+ [format_reason(Reason), " at ", format_trace(Trace)];
+
format_reason(Reason) ->
{Str, _} = couch_log_trunc_io:print(Reason, 500),
Str.
[2/2] couch-log commit: updated refs/heads/master to 038586b
Posted by da...@apache.org.
Add format character for process exit traces
When receiving an 'EXIT' or 'DOWN' message the Reason term can now be
formatted by couch_log using a "~r" format character.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-log/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-log/commit/038586b7
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-log/tree/038586b7
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-log/diff/038586b7
Branch: refs/heads/master
Commit: 038586b7ab6cfec1b15f44162eddb5723803be21
Parents: b6eca22
Author: Paul J. Davis <pa...@gmail.com>
Authored: Mon Jul 25 12:26:49 2016 -0500
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Mon Jul 25 12:26:49 2016 -0500
----------------------------------------------------------------------
src/couch_log_trunc_io_fmt.erl | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch-log/blob/038586b7/src/couch_log_trunc_io_fmt.erl
----------------------------------------------------------------------
diff --git a/src/couch_log_trunc_io_fmt.erl b/src/couch_log_trunc_io_fmt.erl
index 7f3ba37..77f0b2e 100644
--- a/src/couch_log_trunc_io_fmt.erl
+++ b/src/couch_log_trunc_io_fmt.erl
@@ -121,6 +121,7 @@ collect_cc([$p|Fmt], [A|Args]) -> {$p,[A],Fmt,Args};
collect_cc([$W|Fmt], [A,Depth|Args]) -> {$W,[A,Depth],Fmt,Args};
collect_cc([$P|Fmt], [A,Depth|Args]) -> {$P,[A,Depth],Fmt,Args};
collect_cc([$s|Fmt], [A|Args]) -> {$s,[A],Fmt,Args};
+collect_cc([$r|Fmt], [A|Args]) -> {$r,[A],Fmt,Args};
collect_cc([$e|Fmt], [A|Args]) -> {$e,[A],Fmt,Args};
collect_cc([$f|Fmt], [A|Args]) -> {$f,[A],Fmt,Args};
collect_cc([$g|Fmt], [A|Args]) -> {$g,[A],Fmt,Args};
@@ -254,6 +255,10 @@ control2($s, [L0], F, Adj, P, Pad, latin1, L) ->
control2($s, [L0], F, Adj, P, Pad, unicode, L) ->
List = couch_log_trunc_io:fprint(cdata_to_chars(L0), L, [{force_strings, true}]),
Res = uniconv(string(List, F, Adj, P, Pad)),
+ {Res, lists:flatlength(Res)};
+control2($r, [R], F, Adj, P, Pad, _Enc, _L) ->
+ List = couch_log_formatter:format_reason(R),
+ Res = string(List, F, Adj, P, Pad),
{Res, lists:flatlength(Res)}.
iolist_to_chars([C|Cs]) when is_integer(C), C >= $\000, C =< $\377 ->