diff options
| author | Marcus Arendt <[email protected]> | 2014-08-08 15:04:28 +0200 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2014-08-08 15:04:28 +0200 |
| commit | 05c8a2f9ba5c93985fb64a63f19ed4de22560829 (patch) | |
| tree | 89253eecdf161489dd68ee35ae584c99ab373443 /lib/orber/src/orber_env.erl | |
| parent | 07b86000da9f50be61fe3fa04ac530c0cf8930d9 (diff) | |
| parent | e189bae81fbc873d3349b9dec12ef234daf9d8ad (diff) | |
| download | otp-05c8a2f9ba5c93985fb64a63f19ed4de22560829.tar.gz otp-05c8a2f9ba5c93985fb64a63f19ed4de22560829.tar.bz2 otp-05c8a2f9ba5c93985fb64a63f19ed4de22560829.zip | |
Merge branch 'maint'
Conflicts:
OTP_VERSION
Diffstat (limited to 'lib/orber/src/orber_env.erl')
| -rw-r--r-- | lib/orber/src/orber_env.erl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/orber/src/orber_env.erl b/lib/orber/src/orber_env.erl index 1c8a90bc81..16dbb74253 100644 --- a/lib/orber/src/orber_env.erl +++ b/lib/orber/src/orber_env.erl @@ -204,9 +204,9 @@ info(IoDevice) -> _ -> lists:flatten( io_lib:format("======= Orber Execution Environment ======~n" - " *** Orber-~s is not running ***~n" + " *** Orber is not running ***~n" "==========================================~n", - [?ORBVSN])) + [])) end, case IoDevice of info_msg -> @@ -223,6 +223,7 @@ info(IoDevice) -> create_main_info() -> {Major, Minor} = giop_version(), + {orber, _, OrberVsn} = lists:keyfind(orber, 1, application:loaded_applications()), [io_lib:format("======= Orber Execution Environment ======~n" "Orber version.................: ~s~n" "Orber domain..................: ~s~n" @@ -257,7 +258,7 @@ create_main_info() -> "Debug Level...................: ~p~n" "orbInitRef....................: ~p~n" "orbDefaultInitRef.............: ~p~n", - [?ORBVSN, domain(), iiop_port(), nat_iiop_port(), host(), + [OrberVsn, domain(), iiop_port(), nat_iiop_port(), host(), nat_host(), ip_address_local(), orber:orber_nodes(), Major, Minor, iiop_timeout(), iiop_connection_timeout(), |