First cut of splitting the stomp adapter apart. Frame processing is now wrapped up in a gen_server

This commit is contained in:
Rob Harrop 2010-10-27 22:14:19 +01:00
parent b7af8226b8
commit 0508507421
7 changed files with 815 additions and 16 deletions

View File

@ -40,16 +40,18 @@ stop() ->
ok.
start(normal, []) ->
{ok, SupPid} = rabbit_stomp_sup:start_link(),
case application:get_env(listeners) of
undefined -> throw({error, {stomp_configuration_not_found}});
{ok, Listeners} ->
io:format("starting ~s (binding to ~p) ...",
["STOMP Adapter", Listeners]),
{ok, _} = rabbit_stomp_server:start(Listeners),
io:format("done~n")
end,
Listeners = parse_listener_configuration(),
io:format("starting ~s (binding to ~p) ...",
["STOMP Adapter", Listeners]),
{ok, SupPid} = rabbit_stomp_sup:start_link(Listeners),
io:format("done~n"),
{ok, SupPid}.
stop(_State) ->
ok.
parse_listener_configuration() ->
case application:get_env(listeners) of
undefined -> throw({error, {stomp_configuration_not_found}});
{ok, Listeners} -> Listeners
end.

View File

@ -0,0 +1,56 @@
%% The contents of this file are subject to the Mozilla Public License
%% Version 1.1 (the "License"); you may not use this file except in
%% compliance with the License. You may obtain a copy of the License at
%% http://www.mozilla.org/MPL/
%%
%% Software distributed under the License is distributed on an "AS IS"
%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
%% License for the specific language governing rights and limitations
%% under the License.
%%
%% The Original Code is RabbitMQ.
%%
%% The Initial Developers of the Original Code are LShift Ltd,
%% Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
%%
%% Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
%% Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
%% are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
%% Technologies LLC, and Rabbit Technologies Ltd.
%%
%% Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
%% Ltd. Portions created by Cohesive Financial Technologies LLC are
%% Copyright (C) 2007-2009 Cohesive Financial Technologies
%% LLC. Portions created by Rabbit Technologies Ltd are Copyright
%% (C) 2007-2009 Rabbit Technologies Ltd.
%%
%% All Rights Reserved.
%%
%% Contributor(s): ______________________________________.
%%
-module(rabbit_stomp_client_sup).
-behaviour(supervisor).
-define(MAX_WAIT, 16#ffffffff).
-export([start_link/1, init/1]).
start_link(Sock) ->
{ok, SupPid} = supervisor:start_link(?MODULE, []),
{ok, ProcessorPid} =
supervisor:start_child(SupPid,
{rabbit_stomp_processor,
{rabbit_stomp_processor, start_link, [Sock]},
transient, ?MAX_WAIT, worker,
[rabbit_stomp_processor]}),
{ok, ReaderPid} =
supervisor:start_child(SupPid,
{rabbit_stomp_reader,
{rabbit_stomp_reader,
start_link, [ProcessorPid]},
transient, ?MAX_WAIT, worker,
[rabbit_stomp_reader]}),
{ok, SupPid, ReaderPid}.
init([]) ->
{ok, {{one_for_all, 0, 1}, []}}.

View File

@ -0,0 +1,605 @@
%% The contents of this file are subject to the Mozilla Public License
%% Version 1.1 (the "License"); you may not use this file except in
%% compliance with the License. You may obtain a copy of the License at
%% http://www.mozilla.org/MPL/
%%
%% Software distributed under the License is distributed on an "AS IS"
%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
%% License for the specific language governing rights and limitations
%% under the License.
%%
%% The Original Code is RabbitMQ.
%%
%% The Initial Developers of the Original Code are LShift Ltd,
%% Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
%%
%% Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
%% Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
%% are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
%% Technologies LLC, and Rabbit Technologies Ltd.
%%
%% Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
%% Ltd. Portions created by Cohesive Financial Technologies LLC are
%% Copyright (C) 2007-2009 Cohesive Financial Technologies
%% LLC. Portions created by Rabbit Technologies Ltd are Copyright
%% (C) 2007-2009 Rabbit Technologies Ltd.
%%
%% All Rights Reserved.
%%
%% Contributor(s): ______________________________________.
%%
-module(rabbit_stomp_processor).
-behaviour(gen_server).
-export([start_link/1, process_frame/2]).
-export([init/1, handle_call/3, handle_cast/2, handle_info/2,
code_change/3, terminate/2]).
-include_lib("amqp_client/include/amqp_client.hrl").
-include("rabbit_stomp_frame.hrl").
-record(state, {socket, session_id, channel, connection, subscriptions}).
%%----------------------------------------------------------------------------
%% Public API
%%----------------------------------------------------------------------------
start_link(Sock) ->
gen_server:start_link(?MODULE, [Sock], []).
process_frame(Pid, Frame = #stomp_frame{command = Command}) ->
gen_server:cast(Pid, {Command, Frame}).
%%----------------------------------------------------------------------------
%% Basic gen_server callbacks
%%----------------------------------------------------------------------------
init([Sock]) ->
process_flag(trap_exit, true),
{ok,
#state {
socket = Sock,
session_id = none,
channel = none,
connection = none,
subscriptions = dict:new()}
}.
terminate(_Reason, State) ->
shutdown_channel_and_connection(State).
handle_cast({"CONNECT", Frame}, State = #state{channel = none}) ->
{ok, DefaultVHost} = application:get_env(rabbit, default_vhost),
with_error_unwrapping(
fun() ->
do_login(rabbit_stomp_frame:header(Frame, "login"),
rabbit_stomp_frame:header(Frame, "passcode"),
rabbit_stomp_frame:header(Frame, "virtual-host",
binary_to_list(DefaultVHost)),
State)
end, State);
handle_cast(_Request, State = #state{channel = none}) ->
{noreply, send_error("Illegal command",
"You must log in using CONNECT first\n",
State)};
handle_cast({Command, Frame}, State) ->
ensure_receipt(Frame, State),
with_error_unwrapping(
fun() ->
handle_frame(Command, Frame, State)
end, State).
handle_info(#'basic.consume_ok'{}, State) ->
{noreply, State};
handle_info({Delivery = #'basic.deliver'{},
#amqp_msg{props = Props, payload = Payload}}, State) ->
{noreply, send_delivery(Delivery, Props, Payload, State)}.
%%----------------------------------------------------------------------------
%% Frame handlers
%%----------------------------------------------------------------------------
handle_frame("DISCONNECT", _Frame, State) ->
%% We'll get to shutdown the channels in terminate
{stop, normal, State};
handle_frame("SUBSCRIBE", Frame, State) ->
with_destination("SUBSCRIBE", Frame, State, fun do_subscribe/4);
handle_frame("UNSUBSCRIBE", Frame, State = #state{subscriptions = Subs}) ->
ConsumerTag = case rabbit_stomp_frame:header(Frame, "id") of
{ok, IdStr} ->
list_to_binary("T_" ++ IdStr);
not_found ->
case rabbit_stomp_frame:header(Frame,
"destination") of
{ok, QueueStr} ->
list_to_binary("Q_" ++ QueueStr);
not_found ->
missing
end
end,
if
ConsumerTag == missing ->
{noreply, send_error("Missing destination or id",
"UNSUBSCRIBE must include a 'destination' "
"or 'id' header\n",
State)};
true ->
{noreply,
send_method(#'basic.cancel'{consumer_tag = ConsumerTag,
nowait = true},
State#state{subscriptions =
dict:erase(ConsumerTag, Subs)})}
end;
handle_frame("SEND", Frame, State) ->
with_destination("SEND", Frame, State, fun do_send/4);
handle_frame("ACK", Frame, State = #state{session_id = SessionId,
subscriptions = Subs}) ->
case rabbit_stomp_frame:header(Frame, "message-id") of
{ok, IdStr} ->
case rabbit_stomp_util:parse_message_id(IdStr) of
{ok, {ConsumerTag, SessionId, DeliveryTag}} ->
{_DestHdr, SubChannel} = dict:fetch(ConsumerTag, Subs),
Method = #'basic.ack'{delivery_tag = DeliveryTag,
multiple = false},
case transactional(Frame) of
{yes, Transaction} ->
extend_transaction(Transaction,
{SubChannel, Method},
State);
no ->
amqp_channel:call(SubChannel, Method),
{noreply, State}
end;
_ ->
{noreply,
send_error(
"Invalid message-id",
"ACK must include a valid 'message-id' header\n",
State)}
end;
not_found ->
{noreply, send_error("Missing message-id",
"ACK must include a 'message-id' header\n",
State)}
end;
handle_frame("BEGIN", Frame, State) ->
transactional_action(Frame, "BEGIN", fun begin_transaction/2, State);
handle_frame("COMMIT", Frame, State) ->
transactional_action(Frame, "COMMIT", fun commit_transaction/2, State);
handle_frame("ABORT", Frame, State) ->
transactional_action(Frame, "ABORT", fun abort_transaction/2, State);
handle_frame(Command, _Frame, State) ->
{noreply, send_error("Bad command",
"Could not interpret command " ++ Command ++ "\n",
State)}.
%%----------------------------------------------------------------------------
%% Internal helpers for processing frames callbacks
%%----------------------------------------------------------------------------
with_destination(Command, Frame, State, Fun) ->
case rabbit_stomp_frame:header(Frame, "destination") of
{ok, DestHdr} ->
case rabbit_stomp_util:parse_destination(DestHdr) of
{ok, Destination} ->
Fun(Destination, DestHdr, Frame, State);
{error, {invalid_destination, Type, Content}} ->
{noreply, send_error("Invalid destination",
"'~s' is not a valid ~p destination\n",
[Content, Type],
State)};
{error, {unknown_destination, Content}} ->
{noreply, send_error("Unknown destination",
"'~s' is not a valid destination.\n" ++
"Valid exchange types are: " ++
"/exchange, /topic or /queue.\n",
[Content],
State)}
end;
not_found ->
{noreply, send_error("Missing destination",
"~p must include a 'destination' header\n",
[Command],
State)}
end.
do_login({ok, Login}, {ok, Passcode}, VirtualHost, State) ->
{ok, Connection} = amqp_connection:start(
direct, #amqp_params{
username = list_to_binary(Login),
password = list_to_binary(Passcode),
virtual_host = list_to_binary(VirtualHost)}),
{ok, Channel} = amqp_connection:open_channel(Connection),
SessionId = rabbit_guid:string_guid("session"),
{noreply, send_frame("CONNECTED",
[{"session", SessionId}],
"",
State#state{session_id = SessionId,
channel = Channel,
connection = Connection})};
do_login(_, _, _, State) ->
{noreply, send_error("Bad CONNECT", "Missing login or passcode header(s)\n",
State)}.
do_subscribe(Destination, DestHdr, Frame,
State = #state{subscriptions = Subs,
connection = Connection,
channel = MainChannel}) ->
Channel = case Destination of
{queue, _} ->
{ok, Channel1} = amqp_connection:open_channel(Connection),
amqp_channel:call(Channel1,
#'basic.qos'{prefetch_size = 0,
prefetch_count = 1,
global = false}),
Channel1;
_ -> MainChannel
end,
%% TODO: Util method
AckMode = case rabbit_stomp_frame:header(Frame, "ack", "auto") of
"auto" -> auto;
"client" -> client
end,
{ok, Queue} = ensure_queue(subscribe, Destination, Channel),
%% TODO: Util method
ConsumerTag = case rabbit_stomp_frame:header(Frame, "id") of
{ok, Str} ->
list_to_binary("T_" ++ Str);
not_found ->
list_to_binary("Q_" ++ DestHdr)
end,
amqp_channel:subscribe(Channel,
#'basic.consume'{
queue = Queue,
consumer_tag = ConsumerTag,
no_local = false,
no_ack = (AckMode == auto),
exclusive = false},
self()),
ExchangeAndKey = rabbit_stomp_util:parse_routing_information(Destination),
ok = ensure_queue_binding(Queue, ExchangeAndKey, Channel),
{noreply,
State#state{subscriptions =
dict:store(ConsumerTag, {DestHdr, Channel}, Subs)}}.
do_send(Destination, _DestHdr,
Frame = #stomp_frame{headers = Headers,
body_iolist = BodyFragments},
State = #state{channel = Channel}) ->
{ok, _Q} = ensure_queue(send, Destination, Channel),
BinH = fun(K, V) -> rabbit_stomp_frame:binary_header(Frame, K, V) end,
IntH = fun(K, V) -> rabbit_stomp_frame:integer_header(Frame, K, V) end,
Props = #'P_basic'{
content_type = BinH("content-type", <<"text/plain">>),
content_encoding = BinH("content-encoding", undefined),
delivery_mode = IntH("delivery-mode", undefined),
priority = IntH("priority", undefined),
correlation_id = BinH("correlation-id", undefined),
reply_to = BinH("reply-to", undefined),
message_id = BinH("amqp-message-id", undefined),
headers = [rabbit_stomp_util:longstr_field(K, V) ||
{"X-" ++ K, V} <- Headers]},
{Exchange, RoutingKey} =
rabbit_stomp_util:parse_routing_information(Destination),
Method = #'basic.publish'{
exchange = list_to_binary(Exchange),
routing_key = list_to_binary(RoutingKey),
mandatory = false,
immediate = false},
case transactional(Frame) of
{yes, Transaction} ->
extend_transaction(Transaction,
{Method, Props, BodyFragments},
State);
no ->
{noreply, send_method(Method, Props, BodyFragments, State)}
end.
ensure_receipt(Frame, State) ->
case rabbit_stomp_frame:header(Frame, "receipt") of
{ok, Id} -> send_frame("RECEIPT", [{"receipt-id", Id}], "", State);
not_found -> State
end.
send_delivery(#'basic.deliver'{consumer_tag = ConsumerTag,
delivery_tag = DeliveryTag},
#'P_basic'{headers = Headers,
content_type = ContentType,
content_encoding = ContentEncoding,
delivery_mode = DeliveryMode,
priority = Priority,
correlation_id = CorrelationId,
reply_to = ReplyTo,
message_id = MessageId},
Body, State = #state{session_id = SessionId,
subscriptions = Subs}) ->
{Destination, _SubChannel} = dict:fetch(ConsumerTag, Subs),
send_frame(
"MESSAGE",
[{"destination", Destination},
%% TODO append ContentEncoding as ContentType;
%% charset=ContentEncoding? The STOMP SEND handler could also
%% parse "content-type" to split it, perhaps?
{"message-id", rabbit_stomp_util:create_message_id(ConsumerTag,
SessionId,
DeliveryTag)}]
++ maybe_header("content-type", ContentType)
++ maybe_header("content-encoding", ContentEncoding)
++ case ConsumerTag of
<<"Q_", _/binary>> -> [];
<<"T_", Id/binary>> -> [{"subscription", binary_to_list(Id)}]
end
++ adhoc_convert_headers(case Headers of
undefined -> [];
_ -> Headers
end)
++ maybe_header("delivery-mode", DeliveryMode)
++ maybe_header("priority", Priority)
++ maybe_header("correlation-id", CorrelationId)
++ maybe_header("reply-to", ReplyTo)
++ maybe_header("amqp-message-id", MessageId),
Body,
State).
send_method(Method, State = #state{channel = Channel}) ->
amqp_channel:call(Channel, Method),
State.
send_method(Method, Properties, BodyFragments,
State = #state{channel = Channel}) ->
amqp_channel:call(Channel,Method, #amqp_msg{
props = Properties,
payload = lists:reverse(BodyFragments)}),
State.
with_error_unwrapping(Fun, State) ->
case catch Fun() of
{'EXIT',
{{server_initiated_close, ReplyCode, Explanation}, _}} ->
{noreply,
explain_amqp_death(ReplyCode, Explanation, State)};
{'EXIT', Reason} ->
{noreply,
send_priv_error("Processing error", "Processing error\n",
Reason, State)};
Result ->
Result
end.
shutdown_channel_and_connection(State = #state{channel = Channel,
connection = Connection,
subscriptions = Subs}) ->
dict:fold(
fun(_ConsumerTag, {_DestHdr, SubChannel}, Acc) ->
case SubChannel of
Channel -> Acc;
_ ->
amqp_channel:close(SubChannel),
Acc
end
end, 0, Subs),
amqp_channel:close(Channel),
amqp_connection:close(Connection),
State#state{channel = none, connection = none}.
%% TODO: shuffle this off to util. In fact, can we shuffle off the
%% entire message header construction?
maybe_header(_Key, undefined) ->
[];
maybe_header(Key, Value) when is_binary(Value) ->
[{Key, binary_to_list(Value)}];
maybe_header(Key, Value) when is_integer(Value) ->
[{Key, integer_to_list(Value)}];
maybe_header(_Key, _Value) ->
[].
adhoc_convert_headers(Headers) ->
lists:foldr(fun ({K, longstr, V}, Acc) ->
[{"X-" ++ binary_to_list(K), binary_to_list(V)} | Acc];
({K, signedint, V}, Acc) ->
[{"X-" ++ binary_to_list(K), integer_to_list(V)} | Acc];
(_, Acc) ->
Acc
end, [], Headers).
%%----------------------------------------------------------------------------
%% Transaction Support
%%----------------------------------------------------------------------------
transactional(Frame) ->
case rabbit_stomp_frame:header(Frame, "transaction") of
{ok, Transaction} ->
{yes, Transaction};
not_found ->
no
end.
transactional_action(Frame, Name, Fun, State) ->
case transactional(Frame) of
{yes, Transaction} ->
Fun(Transaction, State);
no ->
{noreply, send_error("Missing transaction",
Name ++ " must include a 'transaction' header\n",
State)}
end.
with_transaction(Transaction, State, Fun) ->
case get({transaction, Transaction}) of
undefined ->
{noreply, send_error("Bad transaction",
"Invalid transaction identifier: ~p\n",
[Transaction],
State)};
Actions ->
Fun(Actions, State)
end.
begin_transaction(Transaction, State) ->
put({transaction, Transaction}, []),
{noreply, State}.
extend_transaction(Transaction, Action, State0) ->
with_transaction(
Transaction, State0,
fun (Actions, State) ->
put({transaction, Transaction}, [Action | Actions]),
{noreply, State}
end).
commit_transaction(Transaction, State0) ->
with_transaction(
Transaction, State0,
fun (Actions, State) ->
FinalState = lists:foldr(fun perform_transaction_action/2,
State,
Actions),
erase({transaction, Transaction}),
{noreply, FinalState}
end).
abort_transaction(Transaction, State0) ->
with_transaction(
Transaction, State0,
fun (_Actions, State) ->
erase({transaction, Transaction}),
{noreply, State}
end).
perform_transaction_action({Method}, State) ->
send_method(Method, State);
perform_transaction_action({Channel, Method}, State) ->
amqp_channel:call(Channel, Method),
State;
perform_transaction_action({Method, Props, BodyFragments}, State) ->
send_method(Method, Props, BodyFragments, State).
%%----------------------------------------------------------------------------
%% Queue and Binding Setup
%%----------------------------------------------------------------------------
ensure_queue(subscribe, {exchange, _}, Channel) ->
%% Create anonymous, exclusive queue for SUBSCRIBE on /exchange destinations
#'queue.declare_ok'{queue = Queue} =
amqp_channel:call(Channel, #'queue.declare'{auto_delete = true,
exclusive = true}),
{ok, Queue};
ensure_queue(send, {exchange, _}, _Channel) ->
%% Don't create queues on SEND for /exchange destinations
{ok, undefined};
ensure_queue(_, {queue, Name}, Channel) ->
%% Always create named queue for /queue destinations
Queue = list_to_binary(Name),
#'queue.declare_ok'{queue = Queue} =
amqp_channel:call(Channel,
#'queue.declare'{durable = true,
queue = Queue}),
{ok, Queue};
ensure_queue(subscribe, {topic, _}, Channel) ->
%% Create anonymous, exclusive queue for SUBSCRIBE on /topic destinations
#'queue.declare_ok'{queue = Queue} =
amqp_channel:call(Channel, #'queue.declare'{auto_delete = true,
exclusive = true}),
{ok, Queue};
ensure_queue(send, {topic, _}, _Channel) ->
%% Don't create queues on SEND for /topic destinations
{ok, undefined}.
ensure_queue_binding(Queue, {"", Queue}, _Channel) ->
%% i.e., we should only be asked to bind to the default exchange a
%% queue with its own name
ok;
ensure_queue_binding(Queue, {Exchange, RoutingKey}, Channel) ->
#'queue.bind_ok'{} =
amqp_channel:call(Channel,
#'queue.bind'{
queue = Queue,
exchange = list_to_binary(Exchange),
routing_key = list_to_binary(RoutingKey)}),
ok.
%%----------------------------------------------------------------------------
%% Frame sending utilities
%%----------------------------------------------------------------------------
send_frame(Command, Headers, BodyFragments, State) ->
send_frame(#stomp_frame{command = Command,
headers = Headers,
body_iolist = BodyFragments},
State).
send_frame(Frame, State = #state{socket = Sock}) ->
%% We ignore certain errors here, as we will be receiving an
%% asynchronous notification of the same (or a related) fault
%% shortly anyway. See bug 21365.
%% io:format("Sending ~p~n", [Frame]),
case gen_tcp:send(Sock, rabbit_stomp_frame:serialize(Frame)) of
ok -> State;
{error, closed} -> State;
{error, enotconn} -> State;
{error, Code} ->
error_logger:error_msg("Error sending STOMP frame ~p: ~p~n",
[Frame#stomp_frame.command,
Code]),
State
end.
explain_amqp_death(ReplyCode, Explanation, State) ->
ErrorName = ?PROTOCOL:amqp_exception(ReplyCode),
send_error(atom_to_list(ErrorName), "~s\n",
[Explanation], State).
send_error(Message, Detail, State) ->
send_priv_error(Message, Detail, none, State).
send_error(Message, Format, Args, State) ->
send_priv_error(Message, Format, Args, none, State).
send_priv_error(Message, Detail, ServerPrivateDetail, State) ->
error_logger:error_msg("STOMP error frame sent:~n" ++
"Message: ~p~n" ++
"Detail: ~p~n" ++
"Server private detail: ~p~n",
[Message, Detail, ServerPrivateDetail]),
send_frame("ERROR", [{"message", Message},
{"content-type", "text/plain"}], Detail, State).
send_priv_error(Message, Format, Args, ServerPrivateDetail, State) ->
send_priv_error(Message, lists:flatten(io_lib:format(Format, Args)),
ServerPrivateDetail, State).
%%----------------------------------------------------------------------------
%% Skeleton gen_server callbacks
%%----------------------------------------------------------------------------
handle_call(_Cmd, _From, State) ->
State.
code_change(_OldVsn, State, _Extra) ->
{ok, State}.

View File

@ -0,0 +1,85 @@
%% The contents of this file are subject to the Mozilla Public License
%% Version 1.1 (the "License"); you may not use this file except in
%% compliance with the License. You may obtain a copy of the License at
%% http://www.mozilla.org/MPL/
%%
%% Software distributed under the License is distributed on an "AS IS"
%% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the
%% License for the specific language governing rights and limitations
%% under the License.
%%
%% The Original Code is RabbitMQ.
%%
%% The Initial Developers of the Original Code are LShift Ltd,
%% Cohesive Financial Technologies LLC, and Rabbit Technologies Ltd.
%%
%% Portions created before 22-Nov-2008 00:00:00 GMT by LShift Ltd,
%% Cohesive Financial Technologies LLC, or Rabbit Technologies Ltd
%% are Copyright (C) 2007-2008 LShift Ltd, Cohesive Financial
%% Technologies LLC, and Rabbit Technologies Ltd.
%%
%% Portions created by LShift Ltd are Copyright (C) 2007-2009 LShift
%% Ltd. Portions created by Cohesive Financial Technologies LLC are
%% Copyright (C) 2007-2009 Cohesive Financial Technologies
%% LLC. Portions created by Rabbit Technologies Ltd are Copyright
%% (C) 2007-2009 Rabbit Technologies Ltd.
%%
%% All Rights Reserved.
%%
%% Contributor(s): ______________________________________.
%%
-module(rabbit_stomp_reader).
-export([start_link/1]).
-export([init/1, mainloop/1]).
-include("rabbit_stomp_frame.hrl").
-record(reader_state, {socket, parse_state, processor}).
start_link(ProcessorPid) ->
{ok, proc_lib:spawn_link(?MODULE, init, [ProcessorPid])}.
init(ProcessorPid) ->
receive
{go, Sock} ->
ok = inet:setopts(Sock, [{active, once}]),
{ok, {PeerAddress, PeerPort}} = inet:peername(Sock),
PeerAddressS = inet_parse:ntoa(PeerAddress),
error_logger:info_msg("starting STOMP connection ~p from ~s:~p~n",
[self(), PeerAddressS, PeerPort]),
ParseState = rabbit_stomp_frame:initial_state(),
try
?MODULE:mainloop(#reader_state{socket = Sock,
parse_state = ParseState,
processor = ProcessorPid})
after
error_logger:info_msg("ending STOMP connection ~p from ~s:~p~n",
[self(), PeerAddressS, PeerPort])
end
end.
mainloop(State) ->
receive
{tcp, Sock, Bytes} ->
inet:setopts(Sock, [{active, once}]),
process_received_bytes(Bytes, State);
{tcp_closed, _Sock} ->
ok
end.
process_received_bytes([], State) ->
?MODULE:mainloop(State);
process_received_bytes(Bytes,
State = #reader_state{
processor = Processor,
parse_state = ParseState}) ->
case rabbit_stomp_frame:parse(Bytes, ParseState) of
{more, ParseState1} ->
?MODULE:mainloop(State#reader_state{parse_state = ParseState1});
{ok, Frame, Rest} ->
rabbit_stomp_processor:process_frame(Processor, Frame),
PS = rabbit_stomp_frame:initial_state(),
process_received_bytes(Rest, State#reader_state{parse_state = PS})
end.

View File

@ -47,9 +47,9 @@
start(Listeners) ->
{ok, Pid} = supervisor:start_child(
rabbit_stomp_sup,
{rabbit_stomp_client_sup,
{rabbit_stomp_client_sup_sup,
{tcp_client_sup, start_link,
[{local, rabbit_stomp_client_sup},
[{local, rabbit_stomp_client_sup_sup},
{?MODULE, start_link,[]}]},
transient, infinity, supervisor, [tcp_client_sup]}),
ok = start_listeners(Listeners),

View File

@ -31,11 +31,58 @@
-module(rabbit_stomp_sup).
-behaviour(supervisor).
-export([start_link/0, init/1]).
-export([start_link/1, init/1]).
start_link() ->
supervisor:start_link({local, ?MODULE}, ?MODULE, []).
-export([listener_started/2, listener_stopped/2, start_client/1]).
start_link(Listeners) ->
supervisor:start_link({local, ?MODULE}, ?MODULE, [Listeners]).
init([Listeners]) ->
io:format("Listeners:~p~n", [Listeners]),
ChildSpecs = [
{rabbit_stomp_client_sup_sup,
{tcp_client_sup, start_link,
[{local, rabbit_stomp_client_sup_sup},
{rabbit_stomp_client_sup, start_link,[]}]},
transient,
infinity,
supervisor,
[tcp_client_sup]} | make_listener_specs(Listeners)
],
%% TODO rework supervisor creation to be more OTP like
{ok, {{one_for_all, 10, 10}, ChildSpecs}}.
make_listener_specs(Listeners) ->
lists:foldl(
fun({Host, Port}, Acc) ->
{IPAddress, Name} = rabbit_networking:check_tcp_listener_address(
rabbit_stomp_listener_sup,
Host,
Port),
[{Name,
{tcp_listener_sup, start_link,
[IPAddress, Port,
[{packet, raw},
{reuseaddr, true}],
{?MODULE, listener_started, []},
{?MODULE, listener_stopped, []},
{?MODULE, start_client, []}, "STOMP Listener"]},
transient, infinity, supervisor, [tcp_listener_sup]} | Acc]
end, [], Listeners).
listener_started(_IPAddress, _Port) ->
ok.
listener_stopped(_IPAddress, _Port) ->
ok.
start_client(Sock) ->
{ok, SupPid, ReaderPid} =
supervisor:start_child(rabbit_stomp_client_sup_sup, [Sock]),
ok = gen_tcp:controlling_process(Sock, ReaderPid),
ReaderPid ! {go, Sock},
SupPid.
init([]) ->
{ok, {{one_for_all, 10, 10}, []}}.

View File

@ -33,6 +33,7 @@
-export([parse_destination/1, parse_routing_information/1,
create_message_id/3, parse_message_id/1]).
-export([longstr_field/2]).
-define(QUEUE_PREFIX, "/queue").
-define(TOPIC_PREFIX, "/topic").
@ -40,6 +41,9 @@
-define(MESSAGE_ID_SEPARATOR, "@@").
longstr_field(K, V) ->
{list_to_binary(K), longstr, list_to_binary(V)}.
create_message_id(ConsumerTag, SessionId, DeliveryTag) ->
[ConsumerTag,
?MESSAGE_ID_SEPARATOR,