From 935b39c2f4123cd2b0d37e7be9cf27a8dff131ce Mon Sep 17 00:00:00 2001 From: Simon MacMullen Date: Fri, 7 Jan 2011 10:39:04 +0000 Subject: [PATCH] Compile on R12B5. --- deps/rabbitmq_management/src/rabbit_mgmt_util.erl | 8 +++++--- .../src/rabbit_mgmt_wm_aliveness_test.erl | 7 ++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_util.erl b/deps/rabbitmq_management/src/rabbit_mgmt_util.erl index 1520debf7b..4d4b6e6fe2 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_util.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_util.erl @@ -258,10 +258,12 @@ parse_bool(true) -> true; parse_bool(false) -> false; parse_bool(V) -> throw({error, {not_boolean, V}}). -amqp_request(VHost, ReqData, Context, Method) -> +amqp_request(VHost, ReqData, + Context = #context{ user = #user { username = Username }, + password = Password }, Method) -> try - Params = #amqp_params{username = Context#context.user#user.username, - password = Context#context.password, + Params = #amqp_params{username = Username, + password = Password, virtual_host = VHost}, case amqp_connection:start(direct, Params) of {ok, Conn} -> diff --git a/deps/rabbitmq_management/src/rabbit_mgmt_wm_aliveness_test.erl b/deps/rabbitmq_management/src/rabbit_mgmt_wm_aliveness_test.erl index a01c0c1b9b..1a16b71268 100644 --- a/deps/rabbitmq_management/src/rabbit_mgmt_wm_aliveness_test.erl +++ b/deps/rabbitmq_management/src/rabbit_mgmt_wm_aliveness_test.erl @@ -36,9 +36,10 @@ resource_exists(ReqData, Context) -> _ -> true end, ReqData, Context}. -to_json(ReqData, Context) -> - Params = #amqp_params{username = Context#context.user#user.username, - password = Context#context.password, +to_json(ReqData, Context = #context{ user = #user { username = Username }, + password = Password }) -> + Params = #amqp_params{username = Username, + password = Password, virtual_host = rabbit_mgmt_util:vhost(ReqData)}, %% TODO use network connection (need to check what we're bound to) {ok, Conn} = amqp_connection:start(direct, Params),