merge bug25034

deps/rabbitmq_stomp/src/rabbit_stomp_processor.erl

@@ -194,13 +194,13 @@ process_connect(Implicit, Frame,
                       {Username, Creds} = creds(Frame1, SSLLoginName, Config),
                       {ok, DefaultVHost} =
                           application:get_env(rabbit, default_vhost),
-                      {ProtoName, _} = AdapterInfo#adapter_info.protocol,
+                      {ProtoName, _} = AdapterInfo#amqp_adapter_info.protocol,
                       Res = do_login(
                               Username, Creds,
                               login_header(Frame1, ?HEADER_HOST, DefaultVHost),
                               login_header(Frame1, ?HEADER_HEART_BEAT, "0,0"),
-                                AdapterInfo#adapter_info{
-                                  protocol = {ProtoName, Version}}, Version,
+                              AdapterInfo#amqp_adapter_info{
+                                protocol = {ProtoName, Version}}, Version,
                               StateN#state{frame_transformer = FT}),
                       case {Res, Implicit} of
                           {{ok, _, StateN1}, implicit} -> ok(StateN1);
@@ -489,9 +489,8 @@ do_login(Username, Creds, VirtualHost, Heartbeat, AdapterInfo, Version,
     end.
 
 server_header() ->
-    Props = rabbit_reader:server_properties(?PROTOCOL),
-    {_, Product} = rabbit_misc:table_lookup(Props, <<"product">>),
-    {_, Version} = rabbit_misc:table_lookup(Props, <<"version">>),
+    {ok, Product} = application:get_key(rabbit, id),
+    {ok, Version} = application:get_key(rabbit, vsn),
     rabbit_misc:format("~s/~s", [Product, Version]).
 
 do_subscribe(Destination, DestHdr, Frame,
@@ -939,7 +938,7 @@ ok(Command, Headers, BodyFragments, State) ->
                       body_iolist = BodyFragments}, State}.
 
 amqp_death(ReplyCode, Explanation, State) ->
-    ErrorName = ?PROTOCOL:amqp_exception(ReplyCode),
+    ErrorName = amqp_connection:error_atom(ReplyCode),
     ErrorDesc = rabbit_misc:format("~s~n", [Explanation]),
     log_error(ErrorName, ErrorDesc, none),
     {stop, normal, send_error(atom_to_list(ErrorName), ErrorDesc, State)}.

deps/rabbitmq_stomp/src/rabbit_stomp_reader.erl

@@ -174,13 +174,13 @@ adapter_info(Sock) ->
                {ok, Res3} -> Res3;
                _          -> unknown
            end,
-    #adapter_info{protocol        = {'STOMP', 0},
-                  name            = list_to_binary(Name),
-                  address         = Addr,
-                  port            = Port,
-                  peer_address    = PeerAddr,
-                  peer_port       = PeerPort,
-                  additional_info = maybe_ssl_info(Sock)}.
+    #amqp_adapter_info{protocol        = {'STOMP', 0},
+                       name            = list_to_binary(Name),
+                       address         = Addr,
+                       port            = Port,
+                       peer_address    = PeerAddr,
+                       peer_port       = PeerPort,
+                       additional_info = maybe_ssl_info(Sock)}.
 
 maybe_ssl_info(Sock) ->
     case rabbit_net:is_ssl(Sock) of