From c8096302aa068e7efa6a154746785d8a0f3a98f9 Mon Sep 17 00:00:00 2001 From: Andrew Thompson Date: Thu, 20 Dec 2012 13:34:51 -0500 Subject: [PATCH] Fix a regression about setting loglevel to 'none' --- src/lager_util.erl | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/lager_util.erl b/src/lager_util.erl index 6ba5c00..b6da0f5 100644 --- a/src/lager_util.erl +++ b/src/lager_util.erl @@ -30,7 +30,7 @@ -include("lager.hrl"). levels() -> - [debug, info, notice, warning, error, critical, alert, emergency]. + [debug, info, notice, warning, error, critical, alert, emergency, none]. level_to_num(debug) -> ?DEBUG; level_to_num(info) -> ?INFO; @@ -595,6 +595,8 @@ format_time_test_() -> ]. config_to_levels_test() -> + ?assertEqual([none], config_to_levels('none')), + ?assertEqual({mask, 0}, config_to_mask('none')), ?assertEqual([debug], config_to_levels('=debug')), ?assertEqual([debug], config_to_levels(' ?assertEqual(levels() -- [debug], config_to_levels('!!!=debug')), ok. +config_to_mask_test() -> + ?assertEqual({mask, 0}, config_to_mask('none')), + ?assertEqual({mask, ?DEBUG bor ?INFO bor ?NOTICE bor ?WARNING bor ?ERROR bor ?CRITICAL bor ?ALERT bor ?EMERGENCY}, config_to_mask('debug')), + ?assertEqual({mask, ?WARNING bor ?ERROR bor ?CRITICAL bor ?ALERT bor ?EMERGENCY}, config_to_mask('warning')), + ?assertEqual({mask, ?DEBUG bor ?NOTICE bor ?WARNING bor ?ERROR bor ?CRITICAL bor ?ALERT bor ?EMERGENCY}, config_to_mask('!=info')), + ok. + mask_to_levels_test() -> + ?assertEqual([], mask_to_levels(0)), ?assertEqual([debug], mask_to_levels(2#10000000)), ?assertEqual([debug, info], mask_to_levels(2#11000000)), ?assertEqual([debug, info, emergency], mask_to_levels(2#11000001)),