diff options
author | Henrik Nord <[email protected]> | 2011-04-12 10:36:19 +0200 |
---|---|---|
committer | Henrik Nord <[email protected]> | 2011-04-12 10:36:59 +0200 |
commit | 45644a04188fb9e9fae3a6c86b10afac6c739cc2 (patch) | |
tree | 28977efe2499fe33c05c9548fdaeec0f20f7c1f7 /lib/stdlib/src/gen_server.erl | |
parent | f81c717474ae72164ba6d7f3a29a02c47280511f (diff) | |
parent | 95ed86fc9893460751c5141ff872bdc13814a273 (diff) | |
download | otp-45644a04188fb9e9fae3a6c86b10afac6c739cc2.tar.gz otp-45644a04188fb9e9fae3a6c86b10afac6c739cc2.tar.bz2 otp-45644a04188fb9e9fae3a6c86b10afac6c739cc2.zip |
Merge branch 'gc/gen-format-status-improvements' into dev
* gc/gen-format-status-improvements:
Fix format_status bug for unregistered gen_event processes
Conflicts:
lib/stdlib/test/gen_event_SUITE.erl
OTP-9218
Diffstat (limited to 'lib/stdlib/src/gen_server.erl')
-rw-r--r-- | lib/stdlib/src/gen_server.erl | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/stdlib/src/gen_server.erl b/lib/stdlib/src/gen_server.erl index ac81df9cab..09d94a9c40 100644 --- a/lib/stdlib/src/gen_server.erl +++ b/lib/stdlib/src/gen_server.erl @@ -840,15 +840,8 @@ name_to_pid(Name) -> %%----------------------------------------------------------------- format_status(Opt, StatusData) -> [PDict, SysState, Parent, Debug, [Name, State, Mod, _Time]] = StatusData, - StatusHdr = "Status for generic server", - Header = if - is_pid(Name) -> - lists:concat([StatusHdr, " ", pid_to_list(Name)]); - is_atom(Name); is_list(Name) -> - lists:concat([StatusHdr, " ", Name]); - true -> - {StatusHdr, Name} - end, + Header = gen:format_status_header("Status for generic server", + Name), Log = sys:get_debug(log, Debug, []), DefaultStatus = [{data, [{"State", State}]}], Specfic = |