diff options
| author | Michael Klishin <mklishin@pivotal.io> | 2019-11-12 04:41:33 +0300 |
|---|---|---|
| committer | Michael Klishin <mklishin@pivotal.io> | 2019-11-12 04:41:33 +0300 |
| commit | e046a5c2701c64104adf43d8a4c48acae8ad5953 (patch) | |
| tree | d34cb918add5deb547fbc93b587d17060ea74b9b /src | |
| parent | 723e032d25cc2e2d5ef16cd53279b386b3035760 (diff) | |
| download | rabbitmq-server-git-e046a5c2701c64104adf43d8a4c48acae8ad5953.tar.gz | |
Joint definition import
From both new and old location. Note that it is unlikely
that both will be defined.
Part of rabbitmq/rabbitmq-management#749.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_definitions.erl | 14 | ||||
| -rw-r--r-- | src/rabbit_vhost.erl | 7 |
2 files changed, 18 insertions, 3 deletions
diff --git a/src/rabbit_definitions.erl b/src/rabbit_definitions.erl index 10db0eabe2..a23277a05f 100644 --- a/src/rabbit_definitions.erl +++ b/src/rabbit_definitions.erl @@ -24,8 +24,18 @@ maybe_load_definitions() -> %% this feature was a part of rabbitmq-management for a long time, %% so we check rabbit_management.load_definitions for backward compatibility. - Fallback = application:get_env(rabbitmq_management, load_definitions), - case application:get_env(rabbit, load_definitions, Fallback) of + maybe_load_management_definitions(), + %% this backs "core" load_definitions + maybe_load_core_definitions(). + +maybe_load_core_definitions() -> + maybe_load_definitions(rabbit, load_definitions). + +maybe_load_management_definitions() -> + maybe_load_definitions(rabbitmq_management, load_definitions). + +maybe_load_definitions(App, Key) -> + case application:get_env(App, Key) of undefined -> ok; {ok, none} -> ok; {ok, FileOrDir} -> diff --git a/src/rabbit_vhost.erl b/src/rabbit_vhost.erl index 71cc7c93d2..dbc3d6344a 100644 --- a/src/rabbit_vhost.erl +++ b/src/rabbit_vhost.erl @@ -97,7 +97,12 @@ add(Name, Description, Tags, ActingUser) -> end. do_add(Name, Description, Tags, ActingUser) -> - rabbit_log:info("Adding vhost '~s' (description: '~s')", [Name, Description]), + case Description of + undefined -> + rabbit_log:info("Adding vhost '~s' without a description", [Name]); + Value -> + rabbit_log:info("Adding vhost '~s' (description: '~s')", [Name, Value]) + end, VHost = rabbit_misc:execute_mnesia_transaction( fun () -> case mnesia:wread({rabbit_vhost, Name}) of |