Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Pull request #5

Merged
merged 1 commit into from

2 participants

@baramiya

Hello,

I read email from you.
Would you merge my changes to the master branch?

Thanks.

@muxspace
Owner

Hello, would you mind submitting a pull request into muxspace/bunny_farm, so I can merge this into the master branch? Thanks, Brian

@baramiya

Sure :)

Thanks.

@muxspace muxspace merged commit b6b00d9 into from
@muxspace muxspace referenced this pull request from a commit
@muxspace Revert "Merge pull request #5 from baramiya/master"
This reverts commit b6b00d9, reversing
changes made to fc29063.
f84e017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Dec 18, 2011
  1. @baramiya
This page is out of date. Refresh to see the latest.
View
2  Makefile
@@ -1,4 +1,4 @@
-REBAR:=rebar
+REBAR:=./rebar
.PHONY: all erl test clean doc
View
BIN  rebar
Binary file not shown
View
8 rebar.config
@@ -2,11 +2,11 @@
%{erl_opts, [debug_info, {d,debug}]}.
{deps, [
{lager, ".*",
- {git, "https://github.com/basho/lager", "master"}},
+ {git, "git://github.com/basho/lager", "master"}},
{amqp_client, ".*",
- {git, "git://github.com/dreid/amqp_client.git", "master"}},
+ {git, "git://github.com/jbrisbin/amqp_client.git", {tag, "rabbitmq_2.7.0"}}},
{rabbit_common, ".*",
- {git, "git://github.com/muxspace/rabbit_common.git", "master"}},
+ {git, "git://github.com/jbrisbin/rabbit_common.git", {tag, "rabbitmq_2.7.0"}}},
{'bson', ".*",
- {git, "https://github.com/muxspace/bson_erlang.git", "master"}}
+ {git, "git://github.com/muxspace/bson_erlang.git", "master"}}
]}.
View
4 src/bunny_farm.erl
@@ -193,11 +193,11 @@ open_it(#bus_handle{}=BusHandle) ->
{H,R} = get_server(),
lager:debug("Opening connection to ~p:~p", [H,R]),
[U,P,V] = lists:map(fun get_env/1, Keys),
- Params = #amqp_params{username=U, password=P, virtual_host=V,
+ Params = #amqp_params_network{username=U, password=P, virtual_host=V,
host=H, port=R},
open_it(network, Params, BusHandle).
-open_it(Method, #amqp_params{}=Params, #bus_handle{}=BusHandle) ->
+open_it(Method, #amqp_params_network{}=Params, #bus_handle{}=BusHandle) ->
{ok,Connection} = amqp_connection:start(Method, Params),
{ok,Channel} = amqp_connection:open_channel(Connection),
BusHandle#bus_handle{channel=Channel, conn=Connection}.
Something went wrong with that request. Please try again.