diff options
author | Matthias Radestock <matthias@lshift.net> | 2008-12-23 14:45:22 +0000 |
---|---|---|
committer | Matthias Radestock <matthias@lshift.net> | 2008-12-23 14:45:22 +0000 |
commit | e7f1f330cc2f39b1f33490eb9fa928c409070084 (patch) | |
tree | 0cca7825f9c5ad371f2ca4e39c380e40a50753dc | |
parent | 8154121e282bab4951a11daacb0428ad76c2db3e (diff) | |
parent | 9a607fc177f013e2f69935c973db0bb9470c5a61 (diff) | |
download | rabbitmq-server-e7f1f330cc2f39b1f33490eb9fa928c409070084.tar.gz |
merge default into bug18557
-rw-r--r-- | ebin/rabbit.app | 11 | ||||
-rwxr-xr-x | scripts/rabbitmq-server | 4 | ||||
-rw-r--r-- | src/rabbit_channel.erl | 25 | ||||
-rw-r--r-- | src/rabbit_exchange.erl | 14 |
4 files changed, 37 insertions, 17 deletions
diff --git a/ebin/rabbit.app b/ebin/rabbit.app index 217bb27d..e377a33a 100644 --- a/ebin/rabbit.app +++ b/ebin/rabbit.app @@ -2,9 +2,9 @@ [{description, "RabbitMQ"}, {id, "RabbitMQ"}, {vsn, "%%VERSION%%"}, - {modules, [rabbit, - buffering_proxy, + {modules, [buffering_proxy, rabbit_access_control, + rabbit_alarm, rabbit_amqqueue, rabbit_amqqueue_process, rabbit_amqqueue_sup, @@ -12,21 +12,26 @@ rabbit_binary_parser, rabbit_channel, rabbit_control, + rabbit, rabbit_error_logger, + rabbit_error_logger_file_h, rabbit_exchange, - rabbit_framing, rabbit_framing_channel, + rabbit_framing, rabbit_heartbeat, rabbit_limiter, rabbit_load, rabbit_log, + rabbit_memsup_linux, rabbit_misc, rabbit_mnesia, + rabbit_multi, rabbit_networking, rabbit_node_monitor, rabbit_persister, rabbit_reader, rabbit_router, + rabbit_sasl_report_file_h, rabbit_sup, rabbit_tests, rabbit_tracer, diff --git a/scripts/rabbitmq-server b/scripts/rabbitmq-server index bb65d64d..572262c9 100755 --- a/scripts/rabbitmq-server +++ b/scripts/rabbitmq-server @@ -38,8 +38,8 @@ [ "x" = "x$RABBITMQ_NODE_IP_ADDRESS" ] && RABBITMQ_NODE_IP_ADDRESS=0.0.0.0 [ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=${NODE_PORT} [ "x" = "x$RABBITMQ_NODE_PORT" ] && RABBITMQ_NODE_PORT=5672 -[ "x" = "x$RABBITMQ_SERVER_ERL_ARGS" ] && RABBITMQ_ERL_ARGS=${SERVER_ERL_ARGS} -[ "x" = "x$RABBITMQ_SERVER_ERL_ARGS" ] && RABBITMQ_ERL_ARGS="+K true +A30 \ +[ "x" = "x$RABBITMQ_SERVER_ERL_ARGS" ] && RABBITMQ_SERVER_ERL_ARGS=${SERVER_ERL_ARGS} +[ "x" = "x$RABBITMQ_SERVER_ERL_ARGS" ] && RABBITMQ_SERVER_ERL_ARGS="+K true +A30 \ -kernel inet_default_listen_options [{nodelay,true},{sndbuf,16384},{recbuf,4096}] \ -kernel inet_default_connect_options [{nodelay,true}]" [ "x" = "x$RABBITMQ_CLUSTER_CONFIG_FILE" ] && RABBITMQ_CLUSTER_CONFIG_FILE=${CLUSTER_CONFIG_FILE} diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl index c586df02..4b0cf6d5 100644 --- a/src/rabbit_channel.erl +++ b/src/rabbit_channel.erl @@ -113,20 +113,23 @@ init(ProxyPid, [ReaderPid, WriterPid, Username, VHost]) -> consumer_mapping = dict:new()}. handle_message({method, Method, Content}, State) -> - case (catch handle_method(Method, Content, State)) of - {reply, Reply, NewState} -> - ok = rabbit_writer:send_command(NewState#ch.writer_pid, Reply), - NewState; - {noreply, NewState} -> - NewState; - stop -> - exit(normal); - {'EXIT', {amqp, Error, Explanation, none}} -> + try + case handle_method(Method, Content, State) of + {reply, Reply, NewState} -> + ok = rabbit_writer:send_command(NewState#ch.writer_pid, Reply), + NewState; + {noreply, NewState} -> + NewState; + stop -> + exit(normal) + end + catch + exit:{amqp, Error, Explanation, none} -> terminate({amqp, Error, Explanation, rabbit_misc:method_record_type(Method)}, State); - {'EXIT', Reason} -> - terminate(Reason, State) + _:Reason -> + terminate({Reason, erlang:get_stacktrace()}, State) end; handle_message(terminate, State) -> diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl index 299747d1..c8069e08 100644 --- a/src/rabbit_exchange.erl +++ b/src/rabbit_exchange.erl @@ -238,7 +238,19 @@ route(#exchange{name = Name, type = topic}, RoutingKey) -> %% TODO: This causes a full scan for each entry %% with the same exchange (see bug 19336) topic_matches(BindingKey, RoutingKey)]), - lookup_qpids(mnesia:async_dirty(fun qlc:e/1, [Query])); + lookup_qpids( + try + mnesia:async_dirty(fun qlc:e/1, [Query]) + catch exit:{aborted, {badarg, _}} -> + %% work around OTP-7025, which was fixed in R12B-1, by + %% falling back on a less efficient method + [QName || #route{binding = #binding{queue_name = QName, + key = BindingKey}} <- + mnesia:dirty_match_object( + #route{binding = #binding{exchange_name = Name, + _ = '_'}}), + topic_matches(BindingKey, RoutingKey)] + end); route(X = #exchange{type = fanout}, _) -> route_internal(X, '_'); |