[logger] Add tests for logger_proxy

4 files changed, 166 insertions, 1 deletions

diff --git a/lib/kernel/test/Makefile b/lib/kernel/test/Makefile
index 4a86265a4a..61b0705041 100644
--- a/lib/kernel/test/Makefile
+++ b/lib/kernel/test/Makefile
@@ -76,6 +76,7 @@ MODULES= \
 	logger_filters_SUITE \
 	logger_formatter_SUITE \
 	logger_legacy_SUITE \
+	logger_proxy_SUITE \
 	logger_simple_h_SUITE \
 	logger_std_h_SUITE \
 	logger_test_lib \
diff --git a/lib/kernel/test/logger.spec b/lib/kernel/test/logger.spec
index 1ab90b3e93..553b4f7078 100644
--- a/lib/kernel/test/logger.spec
+++ b/lib/kernel/test/logger.spec
@@ -7,5 +7,6 @@
                            logger_filters_SUITE,
                            logger_formatter_SUITE,
                            logger_legacy_SUITE,
+                           logger_proxy_SUITE,
                            logger_simple_h_SUITE,
                            logger_std_h_SUITE]}.
diff --git a/lib/kernel/test/logger_env_var_SUITE.erl b/lib/kernel/test/logger_env_var_SUITE.erl
index e8d1a313dc..1c073b4fce 100644
--- a/lib/kernel/test/logger_env_var_SUITE.erl
+++ b/lib/kernel/test/logger_env_var_SUITE.erl
@@ -59,7 +59,8 @@ groups() ->
                  logger_undefined,
                  logger_many_handlers_default_first,
                  logger_many_handlers_default_last,
-                 logger_many_handlers_default_last_broken_filter
+                 logger_many_handlers_default_last_broken_filter,
+                 logger_proxy
                 ]},
      {bad,[],[bad_error_logger,
               bad_level,
@@ -541,6 +542,18 @@ logger_many_handlers(Config, Env, LogErr, LogInfo, NumProgress) ->
 
     ok.
 
+logger_proxy(Config) ->
+    %% assume current node runs with default settings
+    DefOpts = logger_olp:get_opts(logger_proxy),
+    {ok,_,Node} = setup(Config,
+                        [{logger,[{proxy,#{sync_mode_qlen=>0,
+                                           drop_mode_qlen=>2}}]}]),
+    Expected = DefOpts#{sync_mode_qlen:=0,
+                        drop_mode_qlen:=2},
+    Expected = rpc:call(Node,logger_olp,get_opts,[logger_proxy]),
+
+    ok.
+
 sasl_compatible_false(Config) ->
     Log = file(Config,?FUNCTION_NAME),
     {ok,_,Node} = setup(Config,
diff --git a/lib/kernel/test/logger_proxy_SUITE.erl b/lib/kernel/test/logger_proxy_SUITE.erl
new file mode 100644
index 0000000000..3197cf35de
--- /dev/null
+++ b/lib/kernel/test/logger_proxy_SUITE.erl
@@ -0,0 +1,150 @@
+%%
+%% %CopyrightBegin%
+%%
+%% Copyright Ericsson AB 2018. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
+-module(logger_proxy_SUITE).
+
+-compile(export_all).
+
+%% -include_lib("common_test/include/ct.hrl").
+%% -include_lib("kernel/include/logger.hrl").
+%% -include_lib("kernel/src/logger_internal.hrl").
+
+%% -define(str,"Log from "++atom_to_list(?FUNCTION_NAME)++
+%%             ":"++integer_to_list(?LINE)).
+%% -define(map_rep,#{function=>?FUNCTION_NAME, line=>?LINE}).
+%% -define(keyval_rep,[{function,?FUNCTION_NAME}, {line,?LINE}]).
+
+%% -define(MY_LOC(N),#{mfa=>{?MODULE,?FUNCTION_NAME,?FUNCTION_ARITY},
+%%                     file=>?FILE, line=>?LINE-N}).
+
+%% -define(TRY(X), my_try(fun() -> X end)).
+
+
+-define(HNAME,list_to_atom(lists:concat([?MODULE,"_",?FUNCTION_NAME]))).
+-define(LOC,#{mfa=>{?MODULE,?FUNCTION_NAME,?FUNCTION_ARITY},line=>?LINE}).
+-define(ENSURE_TIME,5000).
+
+suite() ->
+    [{timetrap,{seconds,30}},
+     {ct_hooks,[logger_test_lib]}].
+
+init_per_suite(Config) ->
+    Config.
+
+end_per_suite(_Config) ->
+    ok.
+
+init_per_group(_Group, Config) ->
+    Config.
+
+end_per_group(_Group, _Config) ->
+    ok.
+
+init_per_testcase(_TestCase, Config) ->
+    Config.
+
+end_per_testcase(Case, Config) ->
+    try apply(?MODULE,Case,[cleanup,Config])
+    catch error:undef -> ok
+    end,
+    ok.
+
+groups() ->
+    [].
+
+all() -> 
+    [basic,
+     emulator,
+     remote,
+     remote_emulator,
+     config].
+
+%%%-----------------------------------------------------------------
+%%% Test cases
+basic(_Config) ->
+    ok = logger:add_handler(?HNAME,?MODULE,#{config=>self()}),
+    logger_proxy ! {log,notice,"Log from: ~p; ~p",[?FUNCTION_NAME,?LINE],L1=?LOC},
+    ok = ensure(L1),
+    logger_proxy ! {log,notice,[{test_case,?FUNCTION_NAME},{line,?LINE}],L2=?LOC},
+    ok = ensure(L2),
+    logger_proxy:log(logger_server:get_proxy_ref(logger),
+                     {remote,node(),{log,notice,
+                                     "Log from: ~p; ~p",
+                                     [?FUNCTION_NAME,?LINE],
+                                     L3=?LOC}}),
+    ok = ensure(L3),
+    logger_proxy:log(logger_server:get_proxy_ref(logger),
+                     {remote,node(),{log,notice,
+                                     [{test_case,?FUNCTION_NAME},
+                                      {line,?LINE}],
+                                     L4=?LOC}}),
+    ok = ensure(L4),
+    ok.
+basic(cleanup,_Config) ->
+    ok = logger:remove_handler(?HNAME).
+
+emulator(_Config) ->
+    ok = logger:add_handler(?HNAME,?MODULE,#{config=>self()}),
+    Pid = spawn(fun() -> erlang:error(some_reason) end),
+    ok = ensure(#{pid=>Pid}),
+    ok.
+emulator(cleanup,_Config) ->
+    ok = logger:remove_handler(?HNAME).
+
+remote(Config) ->
+    {ok,_,Node} = logger_test_lib:setup(Config,[{logger,[{proxy,#{}}]}]),
+    ok = logger:add_handler(?HNAME,?MODULE,#{config=>self()}),
+    L1 = ?LOC, spawn(Node,fun() -> logger:notice("Log from ~p; ~p",[?FUNCTION_NAME,?LINE],L1) end),
+    ok = ensure(L1),
+    L2 = ?LOC, spawn(Node,fun() -> logger:notice([{test_case,?FUNCTION_NAME},{line,?LINE}],L2) end),
+    ok = ensure(L2),
+    ok.
+remote(cleanup,_Config) ->
+    ok = logger:remove_handler(?HNAME).
+
+remote_emulator(Config) ->
+    {ok,_,Node} = logger_test_lib:setup(Config,[{logger,[{proxy,#{}}]}]),
+    ok = logger:add_handler(?HNAME,?MODULE,#{config=>self()}),
+    Pid = spawn(Node,fun() -> erlang:error(some_reason) end),
+    ok = ensure(#{pid=>Pid}),
+    ok.
+remote_emulator(cleanup,_Config) ->
+    ok = logger:remove_handler(?HNAME).
+
+config(_Config) ->
+    {skip,not_yet_implemented}.
+config(cleanup,_Config) ->
+    ok.
+
+%%%-----------------------------------------------------------------
+%%% Internal functions
+
+%% Logger handler callback
+log(#{meta:=Meta},#{config:=Pid}) ->
+    Pid ! {logged,Meta}.
+
+%% Check that the log from the logger callback function log/2 is received
+ensure(Match) ->
+    receive {logged,Meta} ->
+            case maps:with(maps:keys(Match),Meta) of
+                Match -> ok;
+                NoMatch -> {error,Match,Meta,test_server:messages_get()}
+            end
+    after ?ENSURE_TIME -> {error,Match,test_server:messages_get()}
+    end.