Merge branch 'maint'

5 files changed, 77 insertions, 5 deletions

diff --git a/lib/kernel/doc/src/logger.xml b/lib/kernel/doc/src/logger.xml
index f1830a8224..a4d6efa2d8 100644
--- a/lib/kernel/doc/src/logger.xml
+++ b/lib/kernel/doc/src/logger.xml
@@ -696,6 +696,17 @@ start(_, []) ->
     </func>
 
     <func>
+      <name name="set_application_level" arity="2"/>
+      <fsummary>Set the log level for all modules in the specified application.</fsummary>
+      <desc>
+        <p>Set the log level for all the modules of the specified application.</p>
+        <p>This function is a convenience function that calls
+          <seealso marker="#set_module_level/2">logger:set_module_level/2</seealso>
+          for each module associated with an application.</p>
+      </desc>
+    </func>
+
+    <func>
       <name name="set_handler_config" arity="2"/>
       <fsummary>Set configuration data for the specified handler.</fsummary>
       <desc>
@@ -782,8 +793,7 @@ start(_, []) ->
       <name name="set_module_level" arity="2"/>
       <fsummary>Set the log level for the specified modules.</fsummary>
       <desc>
-        <p>Set the log level for the
-          specified modules.</p>
+        <p>Set the log level for the specified modules.</p>
 	<p>The log level for a module overrides the primary log level
 	  of Logger for log events originating from the module in
 	  question. Notice, however, that it does not override the
@@ -839,6 +849,17 @@ start(_, []) ->
     </func>
 
     <func>
+      <name name="unset_application_level" arity="1"/>
+      <fsummary>Unset the log level for all modules in the specified application.</fsummary>
+      <desc>
+        <p>Unset the log level for all the modules of the specified application.</p>
+        <p>This function is a convinience function that calls
+          <seealso marker="#unset_module_level/1">logger:unset_module_level/2</seealso>
+          for each module associated with an application.</p>
+      </desc>
+    </func>
+
+    <func>
       <name name="unset_module_level" arity="0"/>
       <fsummary>Remove module specific log settings for all modules.</fsummary>
       <desc>
diff --git a/lib/kernel/src/logger.erl b/lib/kernel/src/logger.erl
index ffc90f4fc5..0020fe220b 100644
--- a/lib/kernel/src/logger.erl
+++ b/lib/kernel/src/logger.erl
@@ -39,6 +39,7 @@
          remove_primary_filter/1, remove_handler_filter/2,
          set_module_level/2,
          unset_module_level/1, unset_module_level/0,
+         set_application_level/2, unset_application_level/1,
          get_module_level/0, get_module_level/1,
          set_primary_config/1, set_primary_config/2,
          set_handler_config/2, set_handler_config/3,
@@ -488,6 +489,27 @@ unset_module_level(Modules) ->
 unset_module_level() ->
     logger_server:unset_module_level().
 
+-spec set_application_level(Application,Level) -> ok | {error, not_loaded} when
+      Application :: atom(),
+      Level :: level() | all | none.
+set_application_level(App,Level) ->
+    case application:get_key(App, modules) of
+        {ok, Modules} ->
+            set_module_level(Modules, Level);
+        undefined ->
+            {error, {not_loaded, App}}
+    end.
+
+-spec unset_application_level(Application) -> ok | {error, not_loaded} when
+      Application :: atom().
+unset_application_level(App) ->
+    case application:get_key(App, modules) of
+        {ok, Modules} ->
+            unset_module_level(Modules);
+        undefined ->
+            {error, {not_loaded, App}}
+    end.
+
 -spec get_module_level(Modules) -> [{Module,Level}] when
       Modules :: [Module] | Module,
       Module :: module(),
diff --git a/lib/kernel/src/logger_server.erl b/lib/kernel/src/logger_server.erl
index 28e31d46ea..644fdd5af2 100644
--- a/lib/kernel/src/logger_server.erl
+++ b/lib/kernel/src/logger_server.erl
@@ -83,7 +83,7 @@ set_module_level(Modules,Level) when is_list(Modules) ->
                 Error -> Error
             end;
         false ->
-            {error,{not_a_list_of_modles,Modules}}
+            {error,{not_a_list_of_modules,Modules}}
     end;
 set_module_level(Modules,_) ->
     {error,{not_a_list_of_modules,Modules}}.
@@ -96,7 +96,7 @@ unset_module_level(Modules) when is_list(Modules) ->
         true ->
             call({unset_module_level,Modules});
         false ->
-            {error,{not_a_list_of_modles,Modules}}
+            {error,{not_a_list_of_modules,Modules}}
     end;
 unset_module_level(Modules) ->
     {error,{not_a_list_of_modules,Modules}}.
diff --git a/lib/kernel/test/logger_SUITE.erl b/lib/kernel/test/logger_SUITE.erl
index 8f74ebdc47..6bd9b20c35 100644
--- a/lib/kernel/test/logger_SUITE.erl
+++ b/lib/kernel/test/logger_SUITE.erl
@@ -87,6 +87,7 @@ all() ->
      macros,
      set_level,
      set_module_level,
+     set_application_level,
      cache_module_level,
      format_report,
      filter_failed,
@@ -423,6 +424,34 @@ set_module_level(cleanup,_Config) ->
     logger:unset_module_level(?MODULE),
     ok.
 
+set_application_level(_Config) ->
+
+    {error,{not_loaded,mnesia}} = logger:set_application_level(mnesia, warning),
+    {error,{not_loaded,mnesia}} = logger:unset_application_level(mnesia),
+
+    application:load(mnesia),
+    {ok, Modules} = application:get_key(mnesia, modules),
+    [] = logger:get_module_level(Modules),
+
+    {error,{invalid_level,warn}} = logger:set_application_level(mnesia, warn),
+
+    ok = logger:set_application_level(mnesia, debug),
+    DebugModules = lists:sort([{M,debug} || M <- Modules]),
+    DebugModules = lists:sort(logger:get_module_level(Modules)),
+
+    ok = logger:set_application_level(mnesia, warning),
+
+    WarnModules = lists:sort([{M,warning} || M <- Modules]),
+    WarnModules = lists:sort(logger:get_module_level(Modules)),
+
+    ok = logger:unset_application_level(mnesia),
+    [] = logger:get_module_level(Modules).
+
+set_application_level(cleanup,_Config) ->
+    ok = logger:unset_application_level(mnesia),
+    ok = application:unload(mnesia),
+    ok.
+
 cache_module_level(_Config) ->
     ok = logger:unset_module_level(?MODULE),
     [] = ets:lookup(?LOGGER_TABLE,?MODULE), %dirty - add API in logger_config?
diff --git a/scripts/bundle-otp b/scripts/bundle-otp
index 0ffe7d8c77..87b3b90a25 100755
--- a/scripts/bundle-otp
+++ b/scripts/bundle-otp
@@ -22,7 +22,7 @@ for repo in $REPOSITORIES; do
     git clone https://github.com/erlang/$1 $1
     cd $1
     echo $1 $2
-    TAG=`git tag -l | grep -P "$2" | sort -V | tail -1`
+    TAG=`git tag -l | grep -v "\-rc" | grep -P "$2" | sort -V | tail -1`
     git checkout $TAG
     SHA=`git rev-parse --verify HEAD`
     rm -rf .git