diff options
Diffstat (limited to 'src/couch_log/src/couch_log_util.erl')
| -rw-r--r-- | src/couch_log/src/couch_log_util.erl | 170 |
1 files changed, 84 insertions, 86 deletions
diff --git a/src/couch_log/src/couch_log_util.erl b/src/couch_log/src/couch_log_util.erl index c8b8e54ea..8be11e12d 100644 --- a/src/couch_log/src/couch_log_util.erl +++ b/src/couch_log/src/couch_log_util.erl @@ -12,7 +12,6 @@ -module(couch_log_util). - -export([ should_log/1, iso8601_timestamp/0, @@ -25,26 +24,21 @@ string_p/1 ]). - -include("couch_log.hrl"). - -spec should_log(#log_entry{} | atom()) -> boolean(). should_log(#log_entry{level = Level}) -> should_log(Level); - should_log(Level) -> level_to_integer(Level) >= couch_log_config:get(level_int). - -spec iso8601_timestamp() -> string(). iso8601_timestamp() -> - {_,_,Micro} = Now = os:timestamp(), - {{Year,Month,Date},{Hour,Minute,Second}} = calendar:now_to_datetime(Now), + {_, _, Micro} = Now = os:timestamp(), + {{Year, Month, Date}, {Hour, Minute, Second}} = calendar:now_to_datetime(Now), Format = "~4.10.0B-~2.10.0B-~2.10.0BT~2.10.0B:~2.10.0B:~2.10.0B.~6.10.0BZ", io_lib:format(Format, [Year, Month, Date, Hour, Minute, Second, Micro]). - -spec get_msg_id() -> string(). get_msg_id() -> case erlang:get(nonce) of @@ -52,78 +46,73 @@ get_msg_id() -> MsgId -> MsgId end. - -spec level_to_integer(atom() | string() | integer()) -> integer(). level_to_integer(L) when L >= 0, L =< 9 -> L; -level_to_integer(debug) -> 1; -level_to_integer(info) -> 2; -level_to_integer(notice) -> 3; -level_to_integer(warning) -> 4; -level_to_integer(warn) -> 4; -level_to_integer(error) -> 5; -level_to_integer(err) -> 5; -level_to_integer(critical) -> 6; -level_to_integer(crit) -> 6; -level_to_integer(alert) -> 7; -level_to_integer(emergency) -> 8; -level_to_integer(emerg) -> 8; -level_to_integer(none) -> 9; -level_to_integer("debug") -> 1; -level_to_integer("info") -> 2; -level_to_integer("notice") -> 3; -level_to_integer("warning") -> 4; -level_to_integer("warn") -> 4; -level_to_integer("error") -> 5; -level_to_integer("err") -> 5; -level_to_integer("critical") -> 6; -level_to_integer("crit") -> 6; -level_to_integer("alert") -> 7; -level_to_integer("emergency") -> 8; -level_to_integer("emerg") -> 8; -level_to_integer("none") -> 9; -level_to_integer("1") -> 1; -level_to_integer("2") -> 2; -level_to_integer("3") -> 3; -level_to_integer("4") -> 4; -level_to_integer("5") -> 5; -level_to_integer("6") -> 6; -level_to_integer("7") -> 7; -level_to_integer("8") -> 8; -level_to_integer("9") -> 9. - +level_to_integer(debug) -> 1; +level_to_integer(info) -> 2; +level_to_integer(notice) -> 3; +level_to_integer(warning) -> 4; +level_to_integer(warn) -> 4; +level_to_integer(error) -> 5; +level_to_integer(err) -> 5; +level_to_integer(critical) -> 6; +level_to_integer(crit) -> 6; +level_to_integer(alert) -> 7; +level_to_integer(emergency) -> 8; +level_to_integer(emerg) -> 8; +level_to_integer(none) -> 9; +level_to_integer("debug") -> 1; +level_to_integer("info") -> 2; +level_to_integer("notice") -> 3; +level_to_integer("warning") -> 4; +level_to_integer("warn") -> 4; +level_to_integer("error") -> 5; +level_to_integer("err") -> 5; +level_to_integer("critical") -> 6; +level_to_integer("crit") -> 6; +level_to_integer("alert") -> 7; +level_to_integer("emergency") -> 8; +level_to_integer("emerg") -> 8; +level_to_integer("none") -> 9; +level_to_integer("1") -> 1; +level_to_integer("2") -> 2; +level_to_integer("3") -> 3; +level_to_integer("4") -> 4; +level_to_integer("5") -> 5; +level_to_integer("6") -> 6; +level_to_integer("7") -> 7; +level_to_integer("8") -> 8; +level_to_integer("9") -> 9. -spec level_to_atom(atom() | string() | integer()) -> atom(). -level_to_atom(L) when is_atom(L) -> L; -level_to_atom("1") -> debug; -level_to_atom("debug") -> debug; -level_to_atom("2") -> info; -level_to_atom("info") -> info; -level_to_atom("3") -> notice; -level_to_atom("notice") -> notice; -level_to_atom("4") -> warning; -level_to_atom("warning") -> warning; -level_to_atom("warn") -> warning; -level_to_atom("5") -> error; -level_to_atom("error") -> error; -level_to_atom("err") -> error; -level_to_atom("6") -> critical; -level_to_atom("critical") -> critical; -level_to_atom("crit") -> critical; -level_to_atom("7") -> alert; -level_to_atom("alert") -> alert; -level_to_atom("8") -> emergency; -level_to_atom("emergency") -> emergency; -level_to_atom("emerg") -> emergency; -level_to_atom("9") -> none; -level_to_atom("none") -> none; +level_to_atom(L) when is_atom(L) -> L; +level_to_atom("1") -> debug; +level_to_atom("debug") -> debug; +level_to_atom("2") -> info; +level_to_atom("info") -> info; +level_to_atom("3") -> notice; +level_to_atom("notice") -> notice; +level_to_atom("4") -> warning; +level_to_atom("warning") -> warning; +level_to_atom("warn") -> warning; +level_to_atom("5") -> error; +level_to_atom("error") -> error; +level_to_atom("err") -> error; +level_to_atom("6") -> critical; +level_to_atom("critical") -> critical; +level_to_atom("crit") -> critical; +level_to_atom("7") -> alert; +level_to_atom("alert") -> alert; +level_to_atom("8") -> emergency; +level_to_atom("emergency") -> emergency; +level_to_atom("emerg") -> emergency; +level_to_atom("9") -> none; +level_to_atom("none") -> none; level_to_atom(V) when is_integer(V) -> level_to_atom(integer_to_list(V)); -level_to_atom(V) when is_list(V) -> info. - - -level_to_string(L) when is_atom(L) -> atom_to_list(L); -level_to_string(L) -> atom_to_list(level_to_atom(L)). - +level_to_atom(V) when is_list(V) -> info. +level_to_string(L) when is_atom(L) -> atom_to_list(L); +level_to_string(L) -> atom_to_list(level_to_atom(L)). % From error_logger_file_h via lager_stdlib.erl string_p([]) -> @@ -131,19 +120,28 @@ string_p([]) -> string_p(Term) -> string_p1(Term). -string_p1([H|T]) when is_integer(H), H >= $\s, H < 256 -> +string_p1([H | T]) when is_integer(H), H >= $\s, H < 256 -> + string_p1(T); +string_p1([$\n | T]) -> + string_p1(T); +string_p1([$\r | T]) -> + string_p1(T); +string_p1([$\t | T]) -> + string_p1(T); +string_p1([$\v | T]) -> + string_p1(T); +string_p1([$\b | T]) -> + string_p1(T); +string_p1([$\f | T]) -> + string_p1(T); +string_p1([$\e | T]) -> string_p1(T); -string_p1([$\n|T]) -> string_p1(T); -string_p1([$\r|T]) -> string_p1(T); -string_p1([$\t|T]) -> string_p1(T); -string_p1([$\v|T]) -> string_p1(T); -string_p1([$\b|T]) -> string_p1(T); -string_p1([$\f|T]) -> string_p1(T); -string_p1([$\e|T]) -> string_p1(T); -string_p1([H|T]) when is_list(H) -> +string_p1([H | T]) when is_list(H) -> case string_p1(H) of true -> string_p1(T); - _ -> false + _ -> false end; -string_p1([]) -> true; -string_p1(_) -> false. +string_p1([]) -> + true; +string_p1(_) -> + false. |