summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--packaging/debs/Debian/Makefile4
-rw-r--r--src/rabbit_misc.erl11
-rw-r--r--src/rabbit_reader.erl31
-rw-r--r--src/rabbit_router.erl8
-rw-r--r--src/rabbit_writer.erl10
5 files changed, 47 insertions, 17 deletions
diff --git a/packaging/debs/Debian/Makefile b/packaging/debs/Debian/Makefile
index dd74c31ea1..3e74cb5231 100644
--- a/packaging/debs/Debian/Makefile
+++ b/packaging/debs/Debian/Makefile
@@ -1,5 +1,6 @@
TARBALL_DIR=../../../dist
TARBALL=$(shell (cd $(TARBALL_DIR); echo rabbitmq-server-[0-9]*.tar.gz))
+DEBIAN_ORIG_TARBALL=$(shell echo $(TARBALL) | sed -e 's:\(.*\)-\(.*\)\(\.tar\.gz\):\1_\2\.orig\3:g')
VERSION=$(shell echo $(TARBALL) | sed -e 's:rabbitmq-server-\(.*\)\.tar\.gz:\1:g')
UNPACKED_DIR=rabbitmq-server-$(VERSION)
PACKAGENAME=rabbitmq-server
@@ -16,7 +17,8 @@ all:
package: clean
make -C ../.. check_tools
- tar -zxvf $(TARBALL_DIR)/$(TARBALL)
+ cp $(TARBALL_DIR)/$(TARBALL) $(DEBIAN_ORIG_TARBALL)
+ tar -zxvf $(DEBIAN_ORIG_TARBALL)
cp -r debian $(UNPACKED_DIR)
chmod a+x $(UNPACKED_DIR)/debian/rules
UNOFFICIAL_RELEASE=$(UNOFFICIAL_RELEASE) VERSION=$(VERSION) ./check-changelog.sh rabbitmq-server $(UNPACKED_DIR)
diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl
index 3e4ed8f36f..89648f4f1e 100644
--- a/src/rabbit_misc.erl
+++ b/src/rabbit_misc.erl
@@ -34,7 +34,7 @@
-export([dirty_read/1]).
-export([r/3, r/2, rs/1]).
-export([enable_cover/0, report_cover/0]).
--export([with_exit_handler/2]).
+-export([throw_on_error/2, with_exit_handler/2]).
-export([with_user/2, with_vhost/2, with_user_and_vhost/3]).
-export([execute_mnesia_transaction/1]).
-export([ensure_ok/2]).
@@ -76,6 +76,8 @@
-spec(rs/1 :: (r(atom())) -> string()).
-spec(enable_cover/0 :: () -> 'ok' | {'error', any()}).
-spec(report_cover/0 :: () -> 'ok').
+-spec(throw_on_error/2 ::
+ (atom(), thunk({error, any()} | {ok, A} | A)) -> A).
-spec(with_exit_handler/2 :: (thunk(A), thunk(A)) -> A).
-spec(with_user/2 :: (username(), thunk(A)) -> A).
-spec(with_vhost/2 :: (vhost(), thunk(A)) -> A).
@@ -197,6 +199,13 @@ report_coverage_percentage(File, Cov, NotCov, Mod) ->
end,
Mod]).
+throw_on_error(E, Thunk) ->
+ case Thunk() of
+ {error, Reason} -> throw({E, Reason});
+ {ok, Res} -> Res;
+ Res -> Res
+ end.
+
with_exit_handler(Handler, Thunk) ->
try
Thunk()
diff --git a/src/rabbit_reader.erl b/src/rabbit_reader.erl
index 7e68b3eddd..ce26c11a0b 100644
--- a/src/rabbit_reader.erl
+++ b/src/rabbit_reader.erl
@@ -166,14 +166,27 @@ teardown_profiling(Value) ->
fprof:analyse([{dest, []}, {cols, 100}])
end.
+inet_op(F) -> rabbit_misc:throw_on_error(inet_error, F).
+
+peername(Sock) ->
+ try
+ {Address, Port} = inet_op(fun () -> inet:peername(Sock) end),
+ AddressS = inet_parse:ntoa(Address),
+ {AddressS, Port}
+ catch
+ Ex -> rabbit_log:error("error on TCP connection ~p:~p~n",
+ [self(), Ex]),
+ rabbit_log:info("closing TCP connection ~p", [self()]),
+ exit(normal)
+ end.
+
start_connection(Parent, Deb, ClientSock) ->
- ProfilingValue = setup_profiling(),
process_flag(trap_exit, true),
- {ok, {PeerAddress, PeerPort}} = inet:peername(ClientSock),
- PeerAddressS = inet_parse:ntoa(PeerAddress),
- rabbit_log:info("starting TCP connection ~p from ~s:~p~n",
- [self(), PeerAddressS, PeerPort]),
+ {PeerAddressS, PeerPort} = peername(ClientSock),
+ ProfilingValue = setup_profiling(),
try
+ rabbit_log:info("starting TCP connection ~p from ~s:~p~n",
+ [self(), PeerAddressS, PeerPort]),
erlang:send_after(?HANDSHAKE_TIMEOUT * 1000, self(),
handshake_timeout),
mainloop(Parent, Deb, switch_callback(
@@ -266,7 +279,8 @@ mainloop(Parent, Deb, State = #v1{sock= Sock, recv_ref = Ref}) ->
end.
switch_callback(OldState, NewCallback, Length) ->
- {ok, Ref} = prim_inet:async_recv(OldState#v1.sock, Length, -1),
+ Ref = inet_op(fun () -> prim_inet:async_recv(
+ OldState#v1.sock, Length, -1) end),
OldState#v1{callback = NewCallback,
recv_ref = Ref}.
@@ -472,7 +486,10 @@ handle_input(handshake, <<"AMQP",1,1,ProtocolMajor,ProtocolMinor>>,
end;
handle_input(handshake, Other, #v1{sock = Sock}) ->
- ok = gen_tcp:send(Sock, <<"AMQP",1,1,?PROTOCOL_VERSION_MAJOR,?PROTOCOL_VERSION_MINOR>>),
+ ok = inet_op(fun () -> gen_tcp:send(
+ Sock, <<"AMQP",1,1,
+ ?PROTOCOL_VERSION_MAJOR,
+ ?PROTOCOL_VERSION_MINOR>>) end),
throw({bad_header, Other});
handle_input(Callback, Data, _State) ->
diff --git a/src/rabbit_router.erl b/src/rabbit_router.erl
index 41a8d64cb3..a233764766 100644
--- a/src/rabbit_router.erl
+++ b/src/rabbit_router.erl
@@ -150,11 +150,9 @@ run_bindings(QPids, IsMandatory, IsImmediate, Txn, Message) ->
fun (QPid, {Routed, Handled}) ->
case catch rabbit_amqqueue:deliver(IsMandatory, IsImmediate,
Txn, Message, QPid) of
- true -> {true, [QPid | Handled]};
- false -> {true, Handled};
- {'EXIT', Reason} -> rabbit_log:warning("delivery to ~p failed:~n~p~n",
- [QPid, Reason]),
- {Routed, Handled}
+ true -> {true, [QPid | Handled]};
+ false -> {true, Handled};
+ {'EXIT', _Reason} -> {Routed, Handled}
end
end,
{false, []},
diff --git a/src/rabbit_writer.erl b/src/rabbit_writer.erl
index 0f6bca91bc..2c7fa2ab90 100644
--- a/src/rabbit_writer.erl
+++ b/src/rabbit_writer.erl
@@ -127,12 +127,16 @@ assemble_frames(Channel, MethodRecord, Content, FrameMax) ->
Channel, Content, FrameMax),
[MethodFrame | ContentFrames].
+tcp_send(Sock, Data) ->
+ rabbit_misc:throw_on_error(inet_error,
+ fun () -> gen_tcp:send(Sock, Data) end).
+
internal_send_command(Sock, Channel, MethodRecord) ->
- ok = gen_tcp:send(Sock, assemble_frames(Channel, MethodRecord)).
+ ok = tcp_send(Sock, assemble_frames(Channel, MethodRecord)).
internal_send_command(Sock, Channel, MethodRecord, Content, FrameMax) ->
- ok = gen_tcp:send(Sock, assemble_frames(Channel, MethodRecord,
- Content, FrameMax)).
+ ok = tcp_send(Sock, assemble_frames(Channel, MethodRecord,
+ Content, FrameMax)).
%% gen_tcp:send/2 does a selective receive of {inet_reply, Sock,
%% Status} to obtain the result. That is bad when it is called from
View Lorry Controller Status