Commits

Ben Hood  committed b508764 Merge

Merged bug21410 into default

  • Participants
  • Parent commits 2d4af3d, a7ca4e3

Comments (0)

Files changed (6)

File Makefile

File contents unchanged.

File src/bql_amqp_rpc_server.erl

 -export([start_link/0]).
 -export([init/1, handle_call/3, handle_cast/2, handle_info/2, terminate/2, code_change/3]).
 
--include("rabbit.hrl").
--include("amqp_client.hrl").
--include("rabbit_framing.hrl").
+-include_lib("amqp_client/include/amqp_client.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit_framing.hrl").
 
 -record(state, { channel }).
 
       Properties = #'P_basic'{correlation_id = CorrelationId},
       lib_amqp:publish(Ch, <<>>, Q, rfc4627:encode(ResponseObj), Properties)
     catch
-      Tag:Error -> io:fwrite("Caught error: ~p,~p~n", [Tag, Error])
+      Tag:Error -> io:fwrite("Caught error: ~p,~p,~p~n", [Tag, Error,
+                              erlang:get_stacktrace()])
     end,
     lib_amqp:ack(Ch, DeliveryTag),
     {noreply, State};

File src/bql_applicator.erl

 
 -export([apply_commands/2]).
 
--include("rabbit.hrl").
--include("rabbit_framing.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit_framing.hrl").
 
 -define(RPC_TIMEOUT, 30000).
 

File test/amq_interface_test.erl

 %%
 -module(amq_interface_test).
 
--include("rabbit.hrl").
--include("rabbit_framing.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
+-include_lib("rabbit_common/include/rabbit_framing.hrl").
 -include_lib("eunit/include/eunit.hrl").
 
 submit_create_command_test() ->

File test/bql_amqp_rpc_client.erl

 
 -module(bql_amqp_rpc_client).
 
--include_lib("rabbit_framing.hrl").
--include_lib("rabbit.hrl").
--include("amqp_client.hrl").
+-include_lib("rabbit_common/include/rabbit_framing.hrl").
+-include_lib("rabbit_common/include/rabbit.hrl").
+-include_lib("amqp_client/include/amqp_client.hrl").
 
 -behaviour(gen_server).
 
 code_change(_OldVsn, State, _Extra) ->
     State.
 
-decode_properties(ClassId, Properties, PropertiesBin) ->
-  case Properties of
-    none -> rabbit_framing:decode_properties(ClassId, PropertiesBin);
-    _    -> Properties
-  end.

File test/command_parser_test.erl

     {ok, Commands} = commands:parse("get from myqueue;"),
     ?assert([{retrieve_message, "myqueue"}] =:= Commands).
 
-darin_queue_test() ->
+drain_queue_test() ->
     {ok, Commands} = commands:parse("drain myqueue;"),
     ?assert([{drain_queue, "myqueue"}] =:= Commands).