Просмотр исходного кода

Update examples to the new interface

Loïc Hoguin 8 лет назад
Родитель
Сommit
ae95e87eb1

+ 4 - 4
examples/chunked_hello_world/src/toppage_handler.erl

@@ -6,10 +6,10 @@
 -export([init/2]).
 
 init(Req, Opts) ->
-	cowboy_req:chunked_reply(200, Req),
-	cowboy_req:chunk("Hello\r\n", Req),
+	cowboy_req:stream_reply(200, Req),
+	cowboy_req:stream_body("Hello\r\n", nofin, Req),
 	timer:sleep(1000),
-	cowboy_req:chunk("World\r\n", Req),
+	cowboy_req:stream_body("World\r\n", nofin, Req),
 	timer:sleep(1000),
-	cowboy_req:chunk("Chunked!\r\n", Req),
+	cowboy_req:stream_body("Chunked!\r\n", fin, Req),
 	{ok, Req, Opts}.

+ 2 - 2
examples/cookie/src/toppage_handler.erl

@@ -7,8 +7,8 @@
 
 init(Req, Opts) ->
 	NewValue = integer_to_list(rand:uniform(1000000)),
-	Req2 = cowboy_req:set_resp_cookie(
-		<<"server">>, NewValue, [{path, <<"/">>}], Req),
+	Req2 = cowboy_req:set_resp_cookie(<<"server">>, NewValue,
+		#{path => <<"/">>}, Req),
 	#{client := ClientCookie, server := ServerCookie}
 		= cowboy_req:match_cookies([{client, [], <<>>}, {server, [], <<>>}], Req2),
 	{ok, Body} = toppage_dtl:render([

+ 1 - 1
examples/echo_post/src/toppage_handler.erl

@@ -12,7 +12,7 @@ init(Req, Opts) ->
 	{ok, Req2, Opts}.
 
 maybe_echo(<<"POST">>, true, Req) ->
-	{ok, PostVals, Req2} = cowboy_req:body_qs(Req),
+	{ok, PostVals, Req2} = cowboy_req:read_urlencoded_body(Req),
 	Echo = proplists:get_value(<<"echo">>, PostVals),
 	echo(Echo, Req2),
 	Req2;

+ 3 - 3
examples/eventsource/src/eventsource_handler.erl

@@ -7,14 +7,14 @@
 -export([info/3]).
 
 init(Req, Opts) ->
-	Req2 = cowboy_req:chunked_reply(200, #{
+	cowboy_req:stream_reply(200, #{
 		<<"content-type">> => <<"text/event-stream">>
 	}, Req),
 	erlang:send_after(1000, self(), {message, "Tick"}),
-	{cowboy_loop, Req2, Opts, 5000}.
+	{cowboy_loop, Req, Opts, 5000}.
 
 info({message, Msg}, Req, State) ->
-	cowboy_req:chunk(["id: ", id(), "\ndata: ", Msg, "\n\n"], Req),
+	cowboy_req:stream_body(["id: ", id(), "\ndata: ", Msg, "\n\n"], nofin, Req),
 	erlang:send_after(1000, self(), {message, "Tick"}),
 	{ok, Req, State}.
 

+ 1 - 1
examples/rest_pastebin/src/toppage_handler.erl

@@ -44,7 +44,7 @@ resource_exists(Req, _State) ->
 
 create_paste(Req, State) ->
 	PasteID = new_paste_id(),
-	{ok, [{<<"paste">>, Paste}], Req2} = cowboy_req:body_qs(Req),
+	{ok, [{<<"paste">>, Paste}], Req2} = cowboy_req:read_urlencoded_body(Req),
 	ok = file:write_file(full_path(PasteID), Paste),
 	case cowboy_req:method(Req2) of
 		<<"POST">> ->