From 0a235e6b1f008ade99b18438e671b93ff82cc268 Mon Sep 17 00:00:00 2001
From: Siri Hansen <siri@erlang.org>
Date: Fri, 8 Jun 2018 14:23:13 +0200
Subject: [logger] Update interface for setting/unsetting module level

* Level can now be set/unset for multiple modules in one call.
* Added functions get_module_level/0 and get_module_level/1.
---
 lib/kernel/src/logger_config.erl | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

(limited to 'lib/kernel/src/logger_config.erl')

diff --git a/lib/kernel/src/logger_config.erl b/lib/kernel/src/logger_config.erl
index 1d35c2e068..8d05648109 100644
--- a/lib/kernel/src/logger_config.erl
+++ b/lib/kernel/src/logger_config.erl
@@ -25,7 +25,7 @@
          get/2, get/3, get/1,
          create/3, create/4, set/3,
          set_module_level/3,unset_module_level/2,
-         cache_module_level/2,
+         get_module_level/1,cache_module_level/2,
          level_to_int/1]).
 
 -include("logger_internal.hrl").
@@ -105,14 +105,25 @@ set(Tid,What,Config) ->
     ets:update_element(Tid,table_key(What),[{2,LevelInt},{3,Config}]),
     ok.
 
-set_module_level(Tid,Module,Level) ->
-    ets:insert(Tid,{Module,level_to_int(Level)}),
+set_module_level(Tid,Modules,Level) ->
+    LevelInt = level_to_int(Level),
+    [ets:insert(Tid,{Module,LevelInt}) || Module <- Modules],
     ok.
 
-unset_module_level(Tid,Module) ->
-    ets:delete(Tid,Module), % should possibley overwrite instead of delete?
+%% should possibly overwrite instead of delete?
+unset_module_level(Tid,all) ->
+    MS = [{{'$1','$2'},[{is_atom,'$1'},{is_integer,'$2'}],[true]}],
+    _ = ets:select_delete(Tid,MS),    
+    ok;
+unset_module_level(Tid,Modules) ->
+    [ets:delete(Tid,Module) || Module <- Modules],
     ok.
 
+get_module_level(Tid) ->
+    MS = [{{'$1','$2'},[{is_atom,'$1'},{is_integer,'$2'}],[{{'$1','$2'}}]}],
+    Modules = ets:select(Tid,MS),
+    lists:sort([{M,int_to_level(L)} || {M,L} <- Modules]).
+
 cache_module_level(Tid,Module) ->
     GlobalLevelInt = ets:lookup_element(Tid,?LOGGER_KEY,2),
     ets:insert_new(Tid,{Module,{GlobalLevelInt,cached}}),
@@ -122,9 +133,8 @@ get(Tid) ->
     {ok,Logger} = get(Tid,logger),
     HMS = [{{table_key('$1'),'_','$2','$3'},[],[{{'$1','$3','$2'}}]}],
     Handlers = ets:select(Tid,HMS),
-    MMS = [{{'$1','$2'},[{is_atom,'$1'},{is_integer,'$2'}],[{{'$1','$2'}}]}],
-    Modules = ets:select(Tid,MMS),
-    {Logger,Handlers,[{M,int_to_level(L)} || {M,L} <- Modules]}.
+    Modules = get_module_level(Tid),
+    {Logger,Handlers,Modules}.
 
 level_to_int(emergency) -> ?EMERGENCY;
 level_to_int(alert) -> ?ALERT;
-- 
cgit v1.2.3