diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2010-11-23 13:35:41 +0000 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2010-11-23 13:35:41 +0000 |
| commit | 5375bc5c6f1821e063bb2ea5da600aa7b755ee3e (patch) | |
| tree | c8eefe89689ff22a912d6bbe198ac550b9d9aab6 /src | |
| parent | 462a16fadee38f9ccf0eaac1f1ff96ea72e9e125 (diff) | |
| parent | b80bd52526abac83d886e12371c86678a66a72e0 (diff) | |
| download | rabbitmq-server-git-5375bc5c6f1821e063bb2ea5da600aa7b755ee3e.tar.gz | |
And, err, merge heads.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_binding.erl | 6 | ||||
| -rw-r--r-- | src/rabbit_plugin_activator.erl | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/src/rabbit_binding.erl b/src/rabbit_binding.erl index 9d1399f7cc..668fb9bb25 100644 --- a/src/rabbit_binding.erl +++ b/src/rabbit_binding.erl @@ -350,10 +350,10 @@ group_bindings_fold(Fun, SrcName, Acc, Removed, Bindings) -> group_bindings_fold(Fun, Fun(SrcName, Bindings, Acc), Removed). maybe_auto_delete(XName, Bindings, Deletions) -> - case rabbit_exchange:lookup(XName) of - {error, not_found} -> + case mnesia:read(rabbit_exchange, XName) of + [] -> add_deletion(XName, {undefined, not_deleted, Bindings}, Deletions); - {ok, X} -> + [X] -> add_deletion(XName, {X, not_deleted, Bindings}, case rabbit_exchange:maybe_auto_delete(X) of not_deleted -> Deletions; diff --git a/src/rabbit_plugin_activator.erl b/src/rabbit_plugin_activator.erl index ef81ddf23a..072f297e69 100644 --- a/src/rabbit_plugin_activator.erl +++ b/src/rabbit_plugin_activator.erl @@ -50,13 +50,9 @@ start() -> io:format("Activating RabbitMQ plugins ...~n"), - %% Ensure Rabbit is loaded so we can access it's environment - application:load(rabbit), %% Determine our various directories - {ok, PluginDir} = application:get_env(rabbit, plugins_dir), - {ok, UnpackedPluginDir} = application:get_env(rabbit, plugins_expand_dir), - + [PluginDir, UnpackedPluginDir] = init:get_plain_arguments(), RootName = UnpackedPluginDir ++ "/rabbit", %% Unpack any .ez plugins |