diff options
author | Michael Bridgen <mikeb@rabbitmq.com> | 2010-08-27 12:07:49 +0100 |
---|---|---|
committer | Michael Bridgen <mikeb@rabbitmq.com> | 2010-08-27 12:07:49 +0100 |
commit | b34b4dae28b1efc5012633e8e0b5c8973aed0b3a (patch) | |
tree | 653a7f5ee952846fbd9f16cad7892801ceaa6f0e | |
parent | 3c1869dc831ed5926715afb0ca26cfa60bfe4aa6 (diff) | |
parent | c56a5320deed761e01b2a3e55d1828b9c54927da (diff) | |
download | rabbitmq-server-b34b4dae28b1efc5012633e8e0b5c8973aed0b3a.tar.gz |
Merge bug23106 (remove rabbit_hooks)
-rw-r--r-- | src/rabbit_msg_store.erl | 16 | ||||
-rw-r--r-- | src/rabbit_multi.erl | 9 | ||||
-rw-r--r-- | src/rabbit_plugin_activator.erl | 7 |
3 files changed, 19 insertions, 13 deletions
diff --git a/src/rabbit_msg_store.erl b/src/rabbit_msg_store.erl index 6576bfbb..ff248c23 100644 --- a/src/rabbit_msg_store.erl +++ b/src/rabbit_msg_store.erl @@ -379,7 +379,7 @@ client_terminate(CState) -> client_delete_and_terminate(CState, Server, Ref) -> ok = client_terminate(CState), - ok = gen_server2:call(Server, {delete_client, Ref}, infinity). + ok = gen_server2:cast(Server, {delete_client, Ref}). successfully_recovered_state(Server) -> gen_server2:pcall(Server, 7, successfully_recovered_state, infinity). @@ -604,12 +604,7 @@ handle_call({new_client_state, CRef}, _From, State #msstate { client_refs = sets:add_element(CRef, ClientRefs) }); handle_call(successfully_recovered_state, _From, State) -> - reply(State #msstate.successfully_recovered, State); - -handle_call({delete_client, CRef}, _From, - State = #msstate { client_refs = ClientRefs }) -> - reply(ok, - State #msstate { client_refs = sets:del_element(CRef, ClientRefs) }). + reply(State #msstate.successfully_recovered, State). handle_cast({write, Guid}, State = #msstate { current_file_handle = CurHdl, @@ -724,7 +719,12 @@ handle_cast({gc_done, Reclaimed, Src, Dst}, handle_cast({set_maximum_since_use, Age}, State) -> ok = file_handle_cache:set_maximum_since_use(Age), - noreply(State). + noreply(State); + +handle_cast({delete_client, CRef}, + State = #msstate { client_refs = ClientRefs }) -> + noreply( + State #msstate { client_refs = sets:del_element(CRef, ClientRefs) }). handle_info(timeout, State) -> noreply(internal_sync(State)); diff --git a/src/rabbit_multi.erl b/src/rabbit_multi.erl index 3facef17..c7a5a600 100644 --- a/src/rabbit_multi.erl +++ b/src/rabbit_multi.erl @@ -93,7 +93,14 @@ usage() -> action(start_all, [NodeCount], RpcTimeout) -> io:format("Starting all nodes...~n", []), application:load(rabbit), - NodeName = rabbit_misc:nodeparts(getenv("RABBITMQ_NODENAME")), + {_NodeNamePrefix, NodeHost} = NodeName = rabbit_misc:nodeparts( + getenv("RABBITMQ_NODENAME")), + case net_adm:names(NodeHost) of + {error, EpmdReason} -> + throw({cannot_connect_to_epmd, NodeHost, EpmdReason}); + {ok, _} -> + ok + end, {NodePids, Running} = case list_to_integer(NodeCount) of 1 -> {NodePid, Started} = start_node(rabbit_misc:makenode(NodeName), diff --git a/src/rabbit_plugin_activator.erl b/src/rabbit_plugin_activator.erl index 0f5ed286..26274a36 100644 --- a/src/rabbit_plugin_activator.erl +++ b/src/rabbit_plugin_activator.erl @@ -77,7 +77,7 @@ start() -> AppList end, AppVersions = [determine_version(App) || App <- AllApps], - {rabbit, RabbitVersion} = proplists:lookup(rabbit, AppVersions), + RabbitVersion = proplists:get_value(rabbit, AppVersions), %% Build the overall release descriptor RDesc = {release, @@ -131,9 +131,8 @@ start() -> error -> error("failed to compile boot script file ~s", [ScriptFile]) end, io:format("~n~w plugins activated:~n", [length(PluginApps)]), - [io:format("* ~s-~s~n", [App, Vsn]) || - App <- PluginApps, - {App, Vsn} <- [proplists:lookup(App, AppVersions)]], + [io:format("* ~s-~s~n", [App, proplists:get_value(App, AppVersions)]) + || App <- PluginApps], io:nl(), halt(), ok. |