diff options
| author | Ingela Andin <ingela@erlang.org> | 2022-01-21 08:12:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-21 08:12:58 +0100 |
| commit | 762ca51de330a7c6f082b9b7d96f6636e89f24a9 (patch) | |
| tree | c1ace43639870795d3d3aea0a7afa7c0acdd61ad /lib | |
| parent | 72f341c1ef34e7eff88be10b9a5ae03ed11bf9c0 (diff) | |
| parent | 3a5ede60b162694b05592acf8bfb6d6c3020ace0 (diff) | |
| download | erlang-762ca51de330a7c6f082b9b7d96f6636e89f24a9.tar.gz | |
Merge pull request #5525 from bucko909/fix--gen_event--crash--message
fix param ordering of gen_event crash
OTP-17878
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/stdlib/src/gen_event.erl | 6 | ||||
| -rw-r--r-- | lib/stdlib/test/gen_event_SUITE.erl | 22 |
2 files changed, 18 insertions, 10 deletions
diff --git a/lib/stdlib/src/gen_event.erl b/lib/stdlib/src/gen_event.erl index ff6e578f2f..4ac44d9b1f 100644 --- a/lib/stdlib/src/gen_event.erl +++ b/lib/stdlib/src/gen_event.erl @@ -897,10 +897,10 @@ format_log_single(#{label:={gen_event,terminate}, Args1 = case Depth of unlimited -> - [Handler,SName,Reason1,LastIn,State]; + [Handler,SName,LastIn,State,Reason1]; _ -> - [Handler,Depth,SName,Depth,Reason1,Depth, - LastIn,Depth,State,Depth] + [Handler,Depth,SName,Depth,LastIn,Depth, + State,Depth,Reason1,Depth] end, {Format1, Args1}; format_log_single(#{label:={gen_event,no_handle_info}, diff --git a/lib/stdlib/test/gen_event_SUITE.erl b/lib/stdlib/test/gen_event_SUITE.erl index 848eecee56..bd3d49cf3a 100644 --- a/lib/stdlib/test/gen_event_SUITE.erl +++ b/lib/stdlib/test/gen_event_SUITE.erl @@ -1334,23 +1334,30 @@ format_log_1(_Config) -> Warning = #{label=>{gen_event,no_handle_info}, module=>?MODULE, - message=>Term}, + message=> Term}, {WF1,WA1} = gen_event:format_log(Warning), WFExpected1 = "** Undefined handle_info in ~p\n" "** Unhandled message: ~tp\n", ct:log("WF1: ~ts~nWA1: ~tp", [WF1,WA1]), WFExpected1 = WF1, [?MODULE,Term] = WA1, + WarningLimited = [1,2,3,4,5,6,7,8,9,'...'], Depth = 10, ok = application:set_env(kernel, error_logger_format_depth, Depth), - Limited = [1,2,3,4,5,6,7,8,9,'...'], + Limited = [1,2,3,4,5,6,7,8,'...'], + LastMsg = ["Last msg" | Term], + State = ["State" | Term], + Reason = ["Reason" | Term], + LastMsgLimited = ["Last msg" | Limited], + StateLimited = ["State" | Limited], + ReasonLimited = ["Reason" | Limited], {F2,A2} = gen_event:format_log(#{label=>{gen_event,terminate}, handler=>Handler, name=>Name, - last_message=>Term, - state=>Term, - reason=>Term}), + last_message=>LastMsg, + state=>State, + reason=>Reason}), FExpected2 = "** gen_event handler ~tP crashed.\n" "** Was installed in ~tP\n" "** Last event was: ~tP\n" @@ -1358,14 +1365,15 @@ format_log_1(_Config) -> "** Reason == ~tP\n", ct:log("F2: ~ts~nA2: ~tp", [F2,A2]), FExpected2 = F2, - [Handler,Depth,Name,Depth,Limited,Depth,Limited,Depth,Limited,Depth] = A2, + [Handler,Depth,Name,Depth,LastMsgLimited,Depth,StateLimited,Depth,ReasonLimited,Depth] = A2, {WF2,WA2} = gen_event:format_log(Warning), WFExpected2 = "** Undefined handle_info in ~p\n" "** Unhandled message: ~tP\n", ct:log("WF2: ~ts~nWA2: ~tp", [WF2,WA2]), WFExpected2 = WF2, - [?MODULE,Limited,Depth] = WA2, + ct:log("WF2: ~tp~nWA2: ~tp", [[?MODULE,WarningLimited,Depth], WA2]), + [?MODULE,WarningLimited,Depth] = WA2, case FD of undefined -> |