Skip to content

Commit 8bbb94c

Browse files
authored
Merge pull request #69 from esl/newest_amqp_client
Add amqp_client 3.7.9 to Amoc release
2 parents b626321 + 64afc30 commit 8bbb94c

File tree

7 files changed

+17
-8
lines changed

7 files changed

+17
-8
lines changed

rebar.config

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,12 @@
1818
{meck, "0.8.12"},
1919
{proper, "1.3.0"},
2020
{cowboy, "2.3.0"},
21-
{fusco, {git, "https://github.com/esl/fusco.git"}}
21+
{fusco, {git, "https://github.com/esl/fusco.git"}},
22+
{amqp_client, "3.7.9"}
2223
]}.
2324

2425
{relx, [
25-
{release, {amoc, "0.9.0"}, [amoc]},
26+
{release, {amoc, "0.9.0"}, [amoc, inets]},
2627
{dev_mode, false},
2728
{include_erts, true},
2829
{include_src, false},

rebar.lock

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{"1.1.0",
2-
[{<<"base16">>,
2+
[{<<"amqp_client">>,{pkg,<<"amqp_client">>,<<"3.7.9">>},0},
3+
{<<"base16">>,
34
{git,"https://github.com/goj/base16.git",
45
{ref,"ec420aa4ce0fb971f155274c606e00188a2ed37d"}},
56
1},
@@ -60,7 +61,9 @@
6061
{git,"https://github.com/okeuday/quickrand.git",
6162
{ref,"336c0d94a6a384f307183b3c14fc2112656dac37"}},
6263
2},
64+
{<<"rabbit_common">>,{pkg,<<"rabbit_common">>,<<"3.7.9">>},1},
6365
{<<"ranch">>,{pkg,<<"ranch">>,<<"1.4.0">>},1},
66+
{<<"ranch_proxy_protocol">>,{pkg,<<"ranch_proxy_protocol">>,<<"2.1.1">>},2},
6467
{<<"recon">>,{pkg,<<"recon">>,<<"2.4.0">>},0},
6568
{<<"setup">>,
6669
{git,"git://github.com/uwiger/setup.git",
@@ -81,6 +84,7 @@
8184
1}]}.
8285
[
8386
{pkg_hash,[
87+
{<<"amqp_client">>, <<"EBEF998500C31D4954E882868806258A9CEBF01DD6C76804B1A2EFDB454753FC">>},
8488
{<<"cowboy">>, <<"268429481D6F41AD5564ADE4A2439C284B569083FCA0D19078AD4F56B4624724">>},
8589
{<<"cowboy_swagger">>, <<"53C36D4228E139F65DB4DB716C1A5BF9CE6DA9BF04C4C785EBB3A1A462CAD223">>},
8690
{<<"cowlib">>, <<"1AFA5B233CEE8F642C153EC6F1DC48DB0DD9A43E2114BC8B43E9D59636F6AE1F">>},
@@ -90,7 +94,9 @@
9094
{<<"lager">>, <<"897EFC7679BB82383448646C96768CDC4E747464DD18B999C7AACA485686B0DA">>},
9195
{<<"meck">>, <<"1F7B1A9F5D12C511848FEC26BBEFD09A21E1432EADB8982D9A8ACEB9891A3CF2">>},
9296
{<<"proper">>, <<"C1ACD51C51DA17A2FE91D7A6FC6A0C25A6A9849D8DC77093533109D1218D8457">>},
97+
{<<"rabbit_common">>, <<"542D2EB8EF8F76E5346B30665604D8D63B8D5CF47D1878243CEC44D1642C4435">>},
9398
{<<"ranch">>, <<"10272F95DA79340FA7E8774BA7930B901713D272905D0012B06CA6D994F8826B">>},
99+
{<<"ranch_proxy_protocol">>, <<"3C4723327166D2D63C0405F4914E2E471C6DE362CC844E9B203AF5763E7C9D25">>},
94100
{<<"recon">>, <<"901FF78B39C754FB4D6FD72DCF0DBD398967BBD2E4D59C08D4D7AA44A73DE91D">>},
95101
{<<"trails">>, <<"D51D7F065F2B692654C611C663BFAC377D47EAFF9D38D0C17ECD031D1A59399A">>}]}
96102
].

scenarios/mongoose_in_band_registration.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ start(MyId) ->
4141

4242
maybe_register(Cfg),
4343

44-
{ok, Client, _, _} = escalus_connection:start(Cfg),
44+
{ok, Client, _} = escalus_connection:start(Cfg),
4545

4646
%%Allow presence stanza only
4747
AllowPresence = fun escalus_pred:is_presence/1,

scenarios/mongoose_simple.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ make_user_cfg(GeriId, R) ->
4040
start(MyId) ->
4141
Cfg = make_user_cfg(MyId, <<"res1">>),
4242

43-
{ok, Client, _, _} = escalus_connection:start(Cfg),
43+
{ok, Client, _} = escalus_connection:start(Cfg),
4444

4545
%%Allow presence stanza only
4646
AllowPresence = fun escalus_pred:is_presence/1,

scenarios/mongoose_ssl_tcp_ws_bosh.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ start(MyId) ->
4343
Transport = choose_transport(MyId),
4444
Cfg = make_user_cfg(MyId, <<"res1">>, Transport),
4545

46-
{ok, Client, _, _} = escalus_connection:start(Cfg),
46+
{ok, Client, _} = escalus_connection:start(Cfg),
4747

4848
%%Allow presence stanza only
4949
AllowPresence = fun escalus_pred:is_presence/1,

scenarios/simple_rest_api.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ do_start(rest, MyId, Cfg) ->
2020
send_message(AuthHeader, MyId - 1),
2121
ok;
2222
do_start(xmpp, _MyId, Cfg) ->
23-
{ok, Client, _, _} = escalus_connection:start(Cfg),
23+
{ok, Client, _} = escalus_connection:start(Cfg),
2424

2525
send_presence_available(Client),
2626

src/amoc.app.src

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@
99
lager,
1010
jiffy,
1111
exometer,
12+
escalus,
1213
ssl,
1314
trails,
1415
cowboy,
15-
cowboy_swagger
16+
cowboy_swagger,
17+
amqp_client
1618
]},
1719
{mod, { amoc_app, []}},
1820
{env, [{repeat_interval, 60000},

0 commit comments

Comments
 (0)