Merge pull request #503 from vikger/master

Prepare for Erlang/OTP 22

.travis.yml

@@ -1,7 +1,7 @@
 sudo: false
 language: erlang
 otp_release:
+  - 22.0
   - 21.1
   - 20.3
-  - 19.3
 

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,

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,