aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorSiri Hansen <[email protected]>2019-02-11 15:54:06 +0100
committerSiri Hansen <[email protected]>2019-02-11 15:54:06 +0100
commitb5fa09f0dd9bd37b0d98a667aa8fcccc727853fd (patch)
treeda9bb100c89f794c2632d29fe4af801072c02056 /lib
parent0699796062861bec095fda747afdcf01bc2f015e (diff)
parent9f88ada0ac1d76aa96184c09f4e256038e92eb3b (diff)
downloadotp-b5fa09f0dd9bd37b0d98a667aa8fcccc727853fd.tar.gz
otp-b5fa09f0dd9bd37b0d98a667aa8fcccc727853fd.tar.bz2
otp-b5fa09f0dd9bd37b0d98a667aa8fcccc727853fd.zip
Merge branch 'maint'
Diffstat (limited to 'lib')
-rw-r--r--lib/observer/src/observer_wx.erl6
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/observer/src/observer_wx.erl b/lib/observer/src/observer_wx.erl
index 1f748cb8d2..e143581727 100644
--- a/lib/observer/src/observer_wx.erl
+++ b/lib/observer/src/observer_wx.erl
@@ -771,7 +771,11 @@ ensure_sasl_started(Node) ->
ensure_mf_h_handler_used(Node) ->
%% is log_mf_h used ?
- Handlers = rpc:block_call(Node, gen_event, which_handlers, [error_logger]),
+ Handlers =
+ case rpc:block_call(Node, gen_event, which_handlers, [error_logger]) of
+ {badrpc,{'EXIT',noproc}} -> []; % OTP-21+ and no event handler exists
+ Hs -> Hs
+ end,
case lists:any(fun(L)-> L == log_mf_h end, Handlers) of
false -> throw("Error: log_mf_h handler not used in sasl."),
error;