From bada7600e58ace9deaee0e6d88c02e271d4ce711 Mon Sep 17 00:00:00 2001 From: Emile Joubert Date: Thu, 1 Dec 2011 12:51:02 +0000 Subject: [PATCH] Wrap --- .../src/rabbit_stomp_processor.erl | 25 +++++++++---------- deps/rabbitmq_stomp/src/rabbit_stomp_util.erl | 3 ++- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/deps/rabbitmq_stomp/src/rabbit_stomp_processor.erl b/deps/rabbitmq_stomp/src/rabbit_stomp_processor.erl index 902ad169a0..f4183f5aea 100644 --- a/deps/rabbitmq_stomp/src/rabbit_stomp_processor.erl +++ b/deps/rabbitmq_stomp/src/rabbit_stomp_processor.erl @@ -357,8 +357,8 @@ cancel_subscription({ok, ConsumerTag, Description}, Frame, maybe_delete_durable_sub(DestHdr, Frame, State = #state{channel = Channel}) -> case rabbit_stomp_util:parse_destination(DestHdr) of {ok, {topic, Name}} -> - case rabbit_stomp_frame:boolean_header - (Frame, ?HEADER_PERSISTENT, false) of + case rabbit_stomp_frame:boolean_header(Frame, + ?HEADER_PERSISTENT, false) of true -> {ok, Id} = rabbit_stomp_frame:header(Frame, ?HEADER_ID), QName = @@ -442,8 +442,8 @@ do_login(Username0, Password0, VirtualHost0, Heartbeat, AdapterInfo, ensure_heartbeats(Heartbeat, State), ok("CONNECTED", [{?HEADER_SESSION, SessionId}, - {?HEADER_HEART_BEAT, io_lib:format("~B,~B", - [SendTimeout, ReceiveTimeout])}, + {?HEADER_HEART_BEAT, + io_lib:format("~B,~B", [SendTimeout, ReceiveTimeout])}, {?HEADER_VERSION, Version}], "", State1#state{session_id = SessionId, @@ -589,11 +589,9 @@ create_nack_method(DeliveryTag, #subscription{multi_ack = IsMulti}) -> multiple = IsMulti}. negotiate_version(Frame) -> - ClientVers = re:split( - rabbit_stomp_frame:header(Frame, ?HEADER_ACCEPT_VERSION, - "1.0"), - ",", - [{return, list}]), + ClientVers = re:split(rabbit_stomp_frame:header( + Frame, ?HEADER_ACCEPT_VERSION, "1.0"), + ",", [{return, list}]), rabbit_stomp_util:negotiate_version(ClientVers, ?SUPPORTED_VERSIONS). @@ -654,8 +652,9 @@ ensure_reply_to(Frame = #stomp_frame{headers = Headers}, State) -> {ReplyQueue, State1} = ensure_reply_queue(TempQueueId, State), {Frame#stomp_frame{ - headers = lists:keyreplace(?HEADER_REPLY_TO, 1, Headers, - {?HEADER_REPLY_TO, ReplyQueue})}, + headers = lists:keyreplace( + ?HEADER_REPLY_TO, 1, Headers, + {?HEADER_REPLY_TO, ReplyQueue})}, State1}; _ -> {Frame, State} @@ -894,8 +893,8 @@ ensure_queue(subscribe, {topic, Name}, Frame, Channel) -> %% subscriptions. Durable subscriptions get shared, named, durable %% queues. Method = - case rabbit_stomp_frame:boolean_header - (Frame, ?HEADER_PERSISTENT, false) of + case rabbit_stomp_frame:boolean_header(Frame, + ?HEADER_PERSISTENT, false) of true -> {ok, Id} = rabbit_stomp_frame:header(Frame, ?HEADER_ID), QName = rabbit_stomp_util:durable_subscription_queue(Name, Id), diff --git a/deps/rabbitmq_stomp/src/rabbit_stomp_util.erl b/deps/rabbitmq_stomp/src/rabbit_stomp_util.erl index 5c945ef39e..66e61b5b99 100644 --- a/deps/rabbitmq_stomp/src/rabbit_stomp_util.erl +++ b/deps/rabbitmq_stomp/src/rabbit_stomp_util.erl @@ -55,7 +55,8 @@ consumer_tag(Frame) -> not_found -> case rabbit_stomp_frame:header(Frame, ?HEADER_DESTINATION) of {ok, DestHdr} -> - {ok, list_to_binary("Q_" ++ DestHdr), "destination='" ++ DestHdr ++ "'"}; + {ok, list_to_binary("Q_" ++ DestHdr), + "destination='" ++ DestHdr ++ "'"}; not_found -> {error, missing_destination_header} end