File 2493-observer-Handle-crash-when-node-goes-down.... of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2493-observer-Handle-crash-when-node-goes-down.patch of Package erlang (Revision 8472c7d584127ce43bf6581cad2d1d57)

Currently displaying revision 8472c7d584127ce43bf6581cad2d1d57 , Show latest

From 150c7ca0cc815fafb79535035d6c3602564dde05 Mon Sep 17 00:00:00 2001
From: Dan Gudmundsson <dgud@erlang.org>
Date: Tue, 9 May 2017 11:49:47 +0200
Subject: [PATCH 3/4] observer: Handle crash when node goes down

Do not crash if observed node stops
---
 lib/observer/src/observer_alloc_wx.erl | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/lib/observer/src/observer_alloc_wx.erl b/lib/observer/src/observer_alloc_wx.erl
index 9506a2b38..ef425f087 100644
--- a/lib/observer/src/observer_alloc_wx.erl
+++ b/lib/observer/src/observer_alloc_wx.erl
@@ -194,14 +194,17 @@ code_change(_, _, State) ->
 %%%%%%%%%%
 
 restart_fetcher(Node, #state{panel=Panel, wins=Wins0, time=Ti} = State) ->
-    SysInfo = observer_wx:try_rpc(Node, observer_backend, sys_info, []),
-    Info = alloc_info(SysInfo),
-    Max = lists:foldl(fun calc_max/2, #{}, Info),
-    {Wins, Samples} = add_data(Info, {0, queue:new()}, Wins0, Ti, true),
-    erlang:send_after(1000 div ?DISP_FREQ, self(), {refresh, 0}),
-    wxWindow:refresh(Panel),
-    precalc(State#state{active=true, appmon=Node, time=Ti#ti{tick=0},
-			wins=Wins, samples=Samples, max=Max}).
+    case rpc:call(Node, observer_backend, sys_info, []) of
+        {badrpc, _} -> State;
+        SysInfo ->
+            Info = alloc_info(SysInfo),
+            Max = lists:foldl(fun calc_max/2, #{}, Info),
+            {Wins, Samples} = add_data(Info, {0, queue:new()}, Wins0, Ti, true),
+            erlang:send_after(1000 div ?DISP_FREQ, self(), {refresh, 0}),
+            wxWindow:refresh(Panel),
+            precalc(State#state{active=true, appmon=Node, time=Ti#ti{tick=0},
+                                wins=Wins, samples=Samples, max=Max})
+    end.
 
 precalc(#state{samples=Data0, paint=Paint, time=Ti, wins=Wins0}=State) ->
     Wins = [precalc(Ti, Data0, Paint, Win) || Win <- Wins0],
-- 
2.13.0

Places

File 2493-observer-Handle-crash-when-node-goes-down.patch of Package erlang (Revision 8472c7d584127ce43bf6581cad2d1d57)

Places