diff options
| author | Siri Hansen <[email protected]> | 2014-03-27 11:27:06 +0100 |
|---|---|---|
| committer | Siri Hansen <[email protected]> | 2014-03-27 11:27:06 +0100 |
| commit | 5b9ffc724e7c3ffe7c775b5113de059e2e25f755 (patch) | |
| tree | 251971e94f68cffefeae627bf23d346d51869bbd /lib/observer/src/cdv_dist_cb.erl | |
| parent | d6b30f44ea610355dab47024acdcb9fc597f96cb (diff) | |
| parent | f51d3ce81c1314d06b76975d9d06bf2b22925a89 (diff) | |
| download | otp-5b9ffc724e7c3ffe7c775b5113de059e2e25f755.tar.gz otp-5b9ffc724e7c3ffe7c775b5113de059e2e25f755.tar.bz2 otp-5b9ffc724e7c3ffe7c775b5113de059e2e25f755.zip | |
Merge branch 'siri/cdv-bugs/OTP-11650'
* siri/cdv-bugs/OTP-11650:
Improve crashdump_viewer_SUITE:start_stop test case
Fix crash in crashdump_viewer when node has multiple creations
Change spawn/1 + monitor/2 to spawn_monitor/1 to avoid deadlock
Diffstat (limited to 'lib/observer/src/cdv_dist_cb.erl')
| -rw-r--r-- | lib/observer/src/cdv_dist_cb.erl | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/observer/src/cdv_dist_cb.erl b/lib/observer/src/cdv_dist_cb.erl index 3860324d6f..f7e6c9aded 100644 --- a/lib/observer/src/cdv_dist_cb.erl +++ b/lib/observer/src/cdv_dist_cb.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2013. All Rights Reserved. +%% Copyright Ericsson AB 2013-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -22,7 +22,8 @@ get_info/1, get_detail_cols/1, get_details/1, - detail_pages/0]). + detail_pages/0, + format/1]). -include_lib("wx/include/wx.hrl"). -include("crashdump_viewer.hrl"). @@ -75,6 +76,11 @@ init_gen_page(Parent, Info) -> Fields = info_fields(), cdv_info_wx:start_link(Parent,{Fields,Info,[]}). +format({creations,Creations}) -> + string:join([integer_to_list(C) || C <- Creations],","); +format(D) -> + D. + %%%----------------------------------------------------------------- %%% Internal info_fields() -> @@ -83,7 +89,7 @@ info_fields() -> {"Type", conn_type}, {"Channel", channel}, {"Controller", {click,controller}}, - {"Creation", creation}, + {"Creation", {{format,fun format/1},creation}}, {"Extra Info", error}]}, {scroll_boxes, [{"Remote Links",1,{click,remote_links}}, |