Ver código fonte

ft: 代码整理

master
SisMaker 4 anos atrás
pai
commit
54e1cb9e87
3 arquivos alterados com 9 adições e 15 exclusões
  1. +3
    -3
      include/eRum.hrl
  2. +1
    -1
      src/crashLog/rumCrashLog.erl
  3. +5
    -11
      src/formatter/rumFormatter.erl

+ 3
- 3
include/eRum.hrl Ver arquivo

@ -54,7 +54,7 @@
-define(RumDefSyncInterval, 1000).
-define(RumDefSyncSize, 1024 * 64). %% 64kb
-define(RumDefCheckInterval, 1000).
-define(RumDefCheckHWM, 0). %% IMY-todo修正该默认值
-define(RumDefCheckHWM, 1000). %% IMY-todo修正该默认值
-define(RumDefFlushQueue, true).
-define(RumDefFlushThreshold, 0). %% IMY-todo修正该默认值
-define(RumDefFormatter, rumFormatter).
@ -66,8 +66,8 @@
-define(RumDefHandler,
[
{rumBkdConsole, [{level, info}]},
{rumBkdFile, [{file, "./log/error.log"}, {level, '>=error'}, {size, 10485760}, {date, "$D0"}, {count, 5}]},
{rumBkdFile, [{file, "./log/console.log"}, {level, '>=debug'}, {size, 10485760}, {date, "$D0"}, {count, 5}]}
{rumBkdFile, [{file, <<"./log/error.log";>>;}, {level, '>=error'}, {size, 10485760}, {date, "$D0"}, {count, 5}]},
{rumBkdFile, [{file, <<"./log/console.log";>>;}, {level, '>=debug'}, {size, 10485760}, {date, "$D0"}, {count, 5}]}
]).
%%

+ 1
- 1
src/crashLog/rumCrashLog.erl Ver arquivo

@ -51,7 +51,7 @@ start(Filename, MaxFmtSize, MaxFileSize, Date, Count, Rotator) ->
start_link(Filename, MaxFmtSize, MaxFileSize, Date, Count, Rotator) ->
gen_srv:start_link({local, ?MODULE}, ?MODULE, {Filename, MaxFmtSize, MaxFileSize, Date, Count, Rotator}, []).
init({RelFilename, MaxFmtSize, MaxFileSize, CfgDate, Count, Rotator} = A) ->
init({RelFilename, MaxFmtSize, MaxFileSize, CfgDate, Count, Rotator}) ->
{ok, Date} = rumUtil:parseRotateSpec(CfgDate),
Filename = rumUtil:parsePath(RelFilename),
case Rotator:openLogFile(Filename, false) of

+ 5
- 11
src/formatter/rumFormatter.erl Ver arquivo

@ -56,9 +56,7 @@ format(Msg, Config) ->
-spec output(term(), rumMsg:rumMsg()) -> iolist().
output(message, Msg) -> rumMsg:message(Msg);
output(date, Msg) ->
rumMsg:datetime(Msg);
output(time, Msg) ->
output(datetime, Msg) ->
rumMsg:datetime(Msg);
output(severity, Msg) ->
atom_to_list(rumMsg:severity(Msg));
@ -109,12 +107,8 @@ output({Prop, Present, Absent, Width}, Msg) when is_atom(Prop) ->
output(Other, _) -> make_printable(Other).
output(message, Msg, _Width) -> rumMsg:message(Msg);
output(date, Msg, _Width) ->
{D, _T} = rumMsg:datetime(Msg),
D;
output(time, Msg, _Width) ->
{_D, T} = rumMsg:datetime(Msg),
T;
output(datetime, Msg, _Width) ->
rumMsg:datetime(Msg);
output(severity, Msg, Width) ->
make_printable(atom_to_list(rumMsg:severity(Msg)), Width);
output(sev, Msg, _Width) ->
@ -211,7 +205,7 @@ get_metadata(Key, Metadata, Default) ->
config(EOL, []) ->
[
date, " ", time, " ", color, "[", severity, "] ",
datetime, " ", color, "[", severity, "] ",
{pid, ""},
{module, [
{pid, ["@"], ""},
@ -222,7 +216,7 @@ config(EOL, []) ->
];
config(EOL, MetaWhitelist) ->
[
date, " ", time, " ", color, "[", severity, "] ",
datetime, " ", color, "[", severity, "] ",
{pid, ""},
{module, [
{pid, ["@"], ""},

Carregando…
Cancelar
Salvar