diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2020-02-25 18:50:21 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-25 18:50:21 +0300 |
| commit | e1795a4ece425dc8ff840ae579a081289ef391fe (patch) | |
| tree | de0454d6a1ca95cbddfec0b2be0bfa2256ece968 | |
| parent | f6fcf32257ddd92286c9e8c3a2206a714369132b (diff) | |
| parent | bfcd6b899882daae5f4c045a92d013644203298d (diff) | |
| download | rabbitmq-server-git-e1795a4ece425dc8ff840ae579a081289ef391fe.tar.gz | |
Merge pull request #2257 from rabbitmq/export-product_info-in-status
rabbit: Export product info in `status()`
| -rw-r--r-- | src/rabbit.erl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/rabbit.erl b/src/rabbit.erl index 836bce462a..65a2e4707e 100644 --- a/src/rabbit.erl +++ b/src/rabbit.erl @@ -33,6 +33,8 @@ -export([product_info/0, product_name/0, product_version/0, + base_product_name/0, + base_product_version/0, motd_file/0, motd/0]). -export([log_locations/0, config_files/0]). %% for testing and mgmt-agent @@ -672,12 +674,16 @@ maybe_print_boot_progress(true, IterationsLeft) -> {memory, any()}]. status() -> - Version = product_version(), + Version = base_product_version(), + #{name := ProductName, + version := ProductVersion} = product_info(), S1 = [{pid, list_to_integer(os:getpid())}, %% The timeout value used is twice that of gen_server:call/2. {running_applications, rabbit_misc:which_applications()}, {os, os:type()}, {rabbitmq_version, Version}, + {product_name, ProductName}, + {product_version, ProductVersion}, {erlang_version, erlang:system_info(system_version)}, {memory, rabbit_vm:memory()}, {alarms, alarms()}, |