diff options
| author | Matthias Radestock <matthias@rabbitmq.com> | 2010-11-23 17:17:07 +0000 |
|---|---|---|
| committer | Matthias Radestock <matthias@rabbitmq.com> | 2010-11-23 17:17:07 +0000 |
| commit | b3db9def142ea58623294ede1c35dfe5a310fdc8 (patch) | |
| tree | a846014d7ff616744f770f64b7c3ad2fa34d21ed /src | |
| parent | ae86a0cef28083e44a8f180ffef2d7dd1d69cab4 (diff) | |
| parent | 16cb47891d6aa3fa924501025e07addbb598b17e (diff) | |
| download | rabbitmq-server-git-b3db9def142ea58623294ede1c35dfe5a310fdc8.tar.gz | |
merge bug23531 into default
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 |