From 0fbda11b68db8494600bf863ab3c85b0e213e514 Mon Sep 17 00:00:00 2001 From: Viktor Gergely Date: Thu, 23 May 2019 10:54:40 +0200 Subject: [PATCH 1/2] Prepare for Erlang/OTP 22 --- rebar.config | 2 +- src/error_logger_lager_h.erl | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/rebar.config b/rebar.config index d869e07..4578da6 100644 --- a/rebar.config +++ b/rebar.config @@ -21,7 +21,7 @@ {erl_opts, [ {lager_extra_sinks, ['__lager_test_sink']}, - {platform_define, "^(19|20|21)", test_statem}, + {platform_define, "^(19|20|21|22)", test_statem}, {platform_define, "^18", 'FUNCTION_NAME', unavailable}, {platform_define, "^18", 'FUNCTION_ARITY', 0}, debug_info, diff --git a/src/error_logger_lager_h.erl b/src/error_logger_lager_h.erl index 3709cc1..95d4f93 100644 --- a/src/error_logger_lager_h.erl +++ b/src/error_logger_lager_h.erl @@ -206,9 +206,13 @@ log_event(Event, #state{sink=Sink} = State) -> {Type, Name, StateName, Reason} = case Args of [TName, _Msg, TStateName, _StateData, TReason] -> {gen_fsm, TName, TStateName, TReason}; - [TName, _Msg, {TStateName, _StateData}, _ExitType, TReason, _FsmType, Stacktrace] -> + %% Handle changed logging in gen_fsm stdlib-3.9 (TPid, ClientArgs) + [TName, _Msg, TPid, TStateName, _StateData, TReason | _ClientArgs] when is_pid(TPid), is_atom(TStateName) -> + {gen_fsm, TName, TStateName, TReason}; + %% Handle changed logging in gen_statem stdlib-3.9 (ClientArgs) + [TName, _Msg, {TStateName, _StateData}, _ExitType, TReason, _CallbackMode, Stacktrace | _ClientArgs] -> {gen_statem, TName, TStateName, {TReason, Stacktrace}}; - [TName, _Msg, [{TStateName, _StateData}], _ExitType, TReason, _FsmType, Stacktrace] -> + [TName, _Msg, [{TStateName, _StateData}], _ExitType, TReason, _CallbackMode, Stacktrace | _ClientArgs] -> %% sometimes gen_statem wraps its statename/data in a list for some reason??? {gen_statem, TName, TStateName, {TReason, Stacktrace}} end, From d85621d8aed29b4af933b545b34cf295db18a8ea Mon Sep 17 00:00:00 2001 From: Viktor Gergely Date: Thu, 23 May 2019 10:54:40 +0200 Subject: [PATCH 2/2] Prepare for Erlang/OTP 22 --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 896c03c..f245c56 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,7 +1,7 @@ sudo: false language: erlang otp_release: + - 22.0 - 21.1 - 20.3 - - 19.3