0
Fork 0
mirror of https://github.com/ninenines/cowboy.git synced 2025-07-14 12:20:24 +00:00

Fix echo_get example

This commit is contained in:
Loïc Hoguin 2016-06-08 20:18:09 +02:00
parent fd07b38952
commit 98323c2d72
3 changed files with 35 additions and 13 deletions

View file

@ -16,9 +16,9 @@ start(_Type, _Args) ->
{"/", toppage_handler, []}
]}
]),
{ok, _} = cowboy:start_http(http, 100, [{port, 8080}], [
{env, [{dispatch, Dispatch}]}
]),
{ok, _} = cowboy:start_clear(http, 100, [{port, 8080}], #{
env => #{dispatch => Dispatch}
}),
echo_get_sup:start_link().
stop(_State) ->

View file

@ -14,9 +14,9 @@ init(Req, Opts) ->
echo(<<"GET">>, undefined, Req) ->
cowboy_req:reply(400, [], <<"Missing echo parameter.">>, Req);
echo(<<"GET">>, Echo, Req) ->
cowboy_req:reply(200, [
{<<"content-type">>, <<"text/plain; charset=utf-8">>}
], Echo, Req);
cowboy_req:reply(200, #{
<<"content-type">> => <<"text/plain; charset=utf-8">>
}, Echo, Req);
echo(_, _, Req) ->
%% Method not allowed.
cowboy_req:reply(405, Req).

View file

@ -42,19 +42,22 @@ do_get_paths(Example0) ->
{ok, CWD} = file:get_cwd(),
Dir = CWD ++ "/../../examples/" ++ Example,
Rel = Dir ++ "/_rel/" ++ Example ++ "_example/bin/" ++ Example ++ "_example",
{Dir, Rel}.
Log = Dir ++ "/_rel/" ++ Example ++ "_example/log/erlang.log.1",
{Dir, Rel, Log}.
do_compile_and_start(Example) ->
{Dir, Rel} = do_get_paths(Example),
ct:comment("~s~n", [os:cmd("cd " ++ Dir ++ " && make distclean && make all")]),
ct:comment("~s~n", [os:cmd(Rel ++ " stop")]),
ct:comment("~s~n", [os:cmd(Rel ++ " start")]),
{Dir, Rel, _} = do_get_paths(Example),
%% TERM=dumb disables relx coloring.
ct:log("~s~n", [os:cmd("cd " ++ Dir ++ " && make distclean && TERM=dumb make all")]),
ct:log("~s~n", [os:cmd(Rel ++ " stop")]),
ct:log("~s~n", [os:cmd(Rel ++ " start")]),
timer:sleep(2000),
ok.
do_stop(Example) ->
{_, Rel} = do_get_paths(Example),
ct:comment("~s~n", [os:cmd(Rel ++ " stop")]),
{_, Rel, Log} = do_get_paths(Example),
ct:log("~s~n", [os:cmd(Rel ++ " stop")]),
ct:log("~s~n", [element(2, file:read_file(Log))]),
ok.
%% TCP and SSL Hello World.
@ -89,3 +92,22 @@ do_hello_world(Transport, Protocol, Config) ->
{response, nofin, 200, _} = gun:await(ConnPid, Ref),
{ok, <<"Hello world!">>} = gun:await_body(ConnPid, Ref),
ok.
%% Echo GET and POST.
echo_get(Config) ->
doc("GET parameter echo example."),
try
do_compile_and_start(echo_get),
do_echo_get(tcp, http, Config),
do_echo_get(tcp, http2, Config)
after
do_stop(echo_get)
end.
do_echo_get(Transport, Protocol, Config) ->
ConnPid = gun_open([{port, 8080}, {type, Transport}, {protocol, Protocol}|Config]),
Ref = gun:get(ConnPid, "/?echo=this+is+fun"),
{response, nofin, 200, _} = gun:await(ConnPid, Ref),
{ok, <<"this is fun">>} = gun:await_body(ConnPid, Ref),
ok.