diff options
author | Simon MacMullen <simon@rabbitmq.com> | 2014-08-12 11:08:52 +0100 |
---|---|---|
committer | Simon MacMullen <simon@rabbitmq.com> | 2014-08-12 11:08:52 +0100 |
commit | 344500abfbc00124f5659ab29954c782d49ded22 (patch) | |
tree | 5f5e270aa7fc905eb8896acb8110cb0b228b6d44 | |
parent | e39734ea3f22db65c54ff54e848daf93fee513b1 (diff) | |
download | rabbitmq-server-344500abfbc00124f5659ab29954c782d49ded22.tar.gz |
Simplify, given the now-temporary nature of this data structure.
-rw-r--r-- | src/rabbit_log.erl | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/rabbit_log.erl b/src/rabbit_log.erl index 43decd68..f60336a1 100644 --- a/src/rabbit_log.erl +++ b/src/rabbit_log.erl @@ -44,11 +44,7 @@ log(Category, Level, Fmt) -> log(Category, Level, Fmt, []). log(Category, Level, Fmt, Args) when is_list(Args) -> - CatLevel = case orddict:find(Category, catlevels()) of - {ok, L} -> L; - error -> level(info) - end, - case level(Level) =< CatLevel of + case level(Level) =< catlevel(Category) of false -> ok; true -> (case Level of info -> fun error_logger:info_msg/2; @@ -64,9 +60,9 @@ warning(Fmt, Args) -> log(default, warning, Fmt, Args). error(Fmt) -> log(default, error, Fmt). error(Fmt, Args) -> log(default, error, Fmt, Args). -catlevels() -> +catlevel(Category) -> {ok, CatLevelList} = application:get_env(rabbit, log_levels), - orddict:from_list([{Cat, level(Level)} || {Cat, Level} <- CatLevelList]). + level(proplists:get_value(Category, CatLevelList, info)). %%-------------------------------------------------------------------- |