← Back to branch summary

~ubuntu-branches/ubuntu/saucy/rabbitmq-server/saucy

« back to all changes in this revision

Viewing changes to plugins-src/rabbitmq-erlang-client/src/amqp_network_connection.erl

  • Committer: Package Import Robot
  • Author(s): Emile Joubert
  • Date: 2013-06-25 11:28:52 UTC
  • mfrom: (0.5.4) (0.1.39 sid)
  • Revision ID: package-import@ubuntu.com-20130625112852-7po8xajec3kvogvv
Tags: 3.1.2-1
New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
plugins-src/rabbitmq-erlang-client/src/amqp_network_connection.erl
42
42
init([]) ->
43
43
    {ok, #state{}}.
44
44
 
45
 
open_channel_args(#state{sock = Sock}) ->
46
 
    [Sock].
 
45
open_channel_args(#state{sock = Sock, frame_max = FrameMax}) ->
 
46
    [Sock, FrameMax].
47
47
 
48
48
do(#'connection.close_ok'{} = CloseOk, State) ->
49
49
    erlang:send_after(?SOCKET_CLOSING_TIMEOUT, self(), socket_closing_timeout),
52
52
    do2(Method, State).
53
53
 
54
54
do2(Method, #state{writer0 = Writer}) ->
55
 
    %% Catching because it expects the {channel_exit, _} message on error
 
55
    %% Catching because it expects the {channel_exit, _, _} message on error
56
56
    catch rabbit_writer:send_command_sync(Writer, Method).
57
57
 
58
58
handle_message(socket_closing_timeout,
65
65
    {stop, socket_closed_unexpectedly, State};
66
66
handle_message({socket_error, _} = SocketError, State) ->
67
67
    {stop, SocketError, State};
68
 
handle_message({channel_exit, Reason}, State) ->
 
68
handle_message({channel_exit, 0, Reason}, State) ->
69
69
    {stop, {channel0_died, Reason}, State};
70
70
handle_message(heartbeat_timeout, State) ->
71
71
    {stop, heartbeat_timeout, State};