diff options
| author | Michael Klishin <michael@clojurewerkz.org> | 2020-06-09 12:23:52 +0300 |
|---|---|---|
| committer | Michael Klishin <michael@clojurewerkz.org> | 2020-06-09 12:23:52 +0300 |
| commit | fea55bafac7d99f945a230d44794bb1964a0deff (patch) | |
| tree | db37ebd0f7b6424acad7134571b4437ad2546d2a /src | |
| parent | c94e7fa2e4a5e67fde7a6955be569f9db95a351b (diff) | |
| download | rabbitmq-server-git-fea55bafac7d99f945a230d44794bb1964a0deff.tar.gz | |
Don't try to load management.load_definitions in the core
See #2368 comments for the background.
References #2368, #2373.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_definitions.erl | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/rabbit_definitions.erl b/src/rabbit_definitions.erl index 68b0df600c..eb201d7efe 100644 --- a/src/rabbit_definitions.erl +++ b/src/rabbit_definitions.erl @@ -19,7 +19,7 @@ -export([boot/0]). %% automatic import on boot --export([maybe_load_definitions/0, maybe_load_definitions_from/2]). +-export([maybe_load_definitions/0, maybe_load_definitions/2, maybe_load_definitions_from/2]). %% import -export([import_raw/1, import_raw/2, import_parsed/1, import_parsed/2, apply_defs/2, apply_defs/3, apply_defs/4, apply_defs/5]). @@ -66,18 +66,10 @@ boot() -> rabbit_sup:start_supervisor_child(definition_import_pool_sup, worker_pool_sup, [PoolSize, ?IMPORT_WORK_POOL]). 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. - maybe_load_management_definitions(), - %% this backs "core" load_definitions - maybe_load_core_definitions(). - -maybe_load_core_definitions() -> + %% Note that management.load_definitions is handled in the plugin for backwards compatibility. + %% This executes the "core" version of load_definitions. maybe_load_definitions(rabbit, load_definitions). -maybe_load_management_definitions() -> - maybe_load_definitions(rabbitmq_management, load_definitions). - -spec import_raw(Body :: binary() | iolist()) -> ok | {error, term()}. import_raw(Body) -> rabbit_log:info("Asked to import definitions. Acting user: ~s", [?INTERNAL_USER]), |