From 3f000d5b07ac59abc65e9c939839194c1b6bbabd Mon Sep 17 00:00:00 2001 From: Michael Klishin Date: Mon, 12 Jun 2017 18:35:32 +0300 Subject: [PATCH 1/2] Update rabbitmq-components.mk --- deps/amqp_client/rabbitmq-components.mk | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/deps/amqp_client/rabbitmq-components.mk b/deps/amqp_client/rabbitmq-components.mk index 078649bee3..ab310f47ef 100644 --- a/deps/amqp_client/rabbitmq-components.mk +++ b/deps/amqp_client/rabbitmq-components.mk @@ -76,6 +76,8 @@ dep_rabbitmq_objc_client = git_rmq rabbitmq-objc-client $(current_r dep_rabbitmq_peer_discovery_aws = git_rmq rabbitmq-peer-discovery-aws $(current_rmq_ref) $(base_rmq_ref) master dep_rabbitmq_peer_discovery_common = git_rmq rabbitmq-peer-discovery-common $(current_rmq_ref) $(base_rmq_ref) master dep_rabbitmq_peer_discovery_consul = git_rmq rabbitmq-peer-discovery-consul $(current_rmq_ref) $(base_rmq_ref) master +dep_rabbitmq_peer_discovery_etcd = git_rmq rabbitmq-peer-discovery-etcd $(current_rmq_ref) $(base_rmq_ref) master +dep_rabbitmq_peer_discovery_k8s = git_rmq rabbitmq-peer-discovery-k8s $(current_rmq_ref) $(base_rmq_ref) master dep_rabbitmq_recent_history_exchange = git_rmq rabbitmq-recent-history-exchange $(current_rmq_ref) $(base_rmq_ref) master dep_rabbitmq_routing_node_stamp = git_rmq rabbitmq-routing-node-stamp $(current_rmq_ref) $(base_rmq_ref) master dep_rabbitmq_rtopic_exchange = git_rmq rabbitmq-rtopic-exchange $(current_rmq_ref) $(base_rmq_ref) master @@ -153,6 +155,8 @@ RABBITMQ_COMPONENTS = amqp_client \ rabbitmq_peer_discovery_aws \ rabbitmq_peer_discovery_common \ rabbitmq_peer_discovery_consul \ + rabbitmq_peer_discovery_etcd \ + rabbitmq_peer_discovery_k8s \ rabbitmq_recent_history_exchange \ rabbitmq_routing_node_stamp \ rabbitmq_rtopic_exchange \ From 85c8499a42a99ff200c48c282cca3cf8556a1ecf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?= Date: Fri, 2 Jun 2017 16:31:13 +0200 Subject: [PATCH 2/2] Use the new rabbit_*_common modules in rabbitmq-common They were created in order to move their associated rabbit_* module to rabbitmq-server to solve a dependency of rabbitmq-common on rabbitmq-server [#118490793] --- deps/amqp_client/src/amqp_channel.erl | 12 ++++++------ deps/amqp_client/src/amqp_channels_manager.erl | 6 +++--- deps/amqp_client/src/amqp_direct_connection.erl | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/deps/amqp_client/src/amqp_channel.erl b/deps/amqp_client/src/amqp_channel.erl index 4727c737e9..e550eadf47 100644 --- a/deps/amqp_client/src/amqp_channel.erl +++ b/deps/amqp_client/src/amqp_channel.erl @@ -500,7 +500,7 @@ handle_info({channel_exit, _ChNumber, Reason}, State) -> handle_channel_exit(Reason, State); %% This comes from rabbit_channel in the direct case handle_info({channel_closing, ChPid}, State) -> - ok = rabbit_channel:ready_for_close(ChPid), + ok = rabbit_channel_common:ready_for_close(ChPid), {noreply, State}; %% @private handle_info({bump_credit, Msg}, State) -> @@ -864,9 +864,9 @@ do(Method, Content, Flow, #state{driver = network, writer = W}) -> do(Method, Content, Flow, #state{driver = direct, writer = W}) -> %% ditto catching because... catch case {Content, Flow} of - {none, _} -> rabbit_channel:do(W, Method); - {_, flow} -> rabbit_channel:do_flow(W, Method, Content); - {_, noflow} -> rabbit_channel:do(W, Method, Content) + {none, _} -> rabbit_channel_common:do(W, Method); + {_, flow} -> rabbit_channel_common:do_flow(W, Method, Content); + {_, noflow} -> rabbit_channel_common:do(W, Method, Content) end. @@ -881,13 +881,13 @@ flush_writer(#state{driver = direct}) -> amqp_msg(none) -> none; amqp_msg(Content) -> - {Props, Payload} = rabbit_basic:from_content(Content), + {Props, Payload} = rabbit_basic_common:from_content(Content), #amqp_msg{props = Props, payload = Payload}. build_content(none) -> none; build_content(#amqp_msg{props = Props, payload = Payload}) -> - rabbit_basic:build_content(Props, Payload). + rabbit_basic_common:build_content(Props, Payload). check_block(_Method, _AmqpMsg, #state{closing = {just_channel, _}}) -> closing; diff --git a/deps/amqp_client/src/amqp_channels_manager.erl b/deps/amqp_client/src/amqp_channels_manager.erl index a78037dd84..145d0aedbe 100644 --- a/deps/amqp_client/src/amqp_channels_manager.erl +++ b/deps/amqp_client/src/amqp_channels_manager.erl @@ -63,10 +63,10 @@ signal_connection_closing(ChMgr, ChannelCloseType, Reason) -> process_channel_frame(Frame, Channel, ChPid, AState) -> case rabbit_command_assembler:process(Frame, AState) of {ok, NewAState} -> NewAState; - {ok, Method, NewAState} -> rabbit_channel:do(ChPid, Method), + {ok, Method, NewAState} -> rabbit_channel_common:do(ChPid, Method), NewAState; - {ok, Method, Content, NewAState} -> rabbit_channel:do(ChPid, Method, - Content), + {ok, Method, Content, NewAState} -> rabbit_channel_common:do(ChPid, Method, + Content), NewAState; {error, Reason} -> ChPid ! {channel_exit, Channel, Reason}, diff --git a/deps/amqp_client/src/amqp_direct_connection.erl b/deps/amqp_client/src/amqp_direct_connection.erl index 2c408e4f0e..e2f3b6e5b6 100644 --- a/deps/amqp_client/src/amqp_direct_connection.erl +++ b/deps/amqp_client/src/amqp_direct_connection.erl @@ -88,7 +88,7 @@ closing(_ChannelCloseType, Reason, State) -> channels_terminated(State = #state{closing_reason = Reason, collector = Collector}) -> - rabbit_queue_collector:delete_all(Collector), + rabbit_queue_collector_common:delete_all(Collector), {stop, {shutdown, Reason}, State}. terminate(_Reason, #state{node = Node}) ->