umgeher/cowboy
0
Fork 0
mirror of https://github.com/ninenines/cowboy.git synced 2025-07-15 04:30:25 +00:00
Code Issues Wiki Activity

Small tweak from erlang:error/1 to error/1

Browse source
This commit is contained in:
Loïc Hoguin 2014-09-24 15:07:59 +03:00
parent c56bada509
commit fd37fad592
2 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/cowboy_router.erl
View file

@ -104,7 +104,7 @@ compile_rules(<< $:, Rest/binary >>, S, Segments, Rules, <<>>) ->
Name = binary_to_atom(NameBin, utf8), Name = binary_to_atom(NameBin, utf8),
compile_rules(Rest2, S, Segments, Rules, Name); compile_rules(Rest2, S, Segments, Rules, Name);
compile_rules(<< $:, _/binary >>, _, _, _, _) -> compile_rules(<< $:, _/binary >>, _, _, _, _) ->
erlang:error(badarg); error(badarg);
compile_rules(<< $[, $., $., $., $], Rest/binary >>, S, Segments, Rules, Acc) compile_rules(<< $[, $., $., $., $], Rest/binary >>, S, Segments, Rules, Acc)
when Acc =:= <<>> -> when Acc =:= <<>> ->
compile_rules(Rest, S, ['...'|Segments], Rules, Acc); compile_rules(Rest, S, ['...'|Segments], Rules, Acc);
@ -116,17 +116,17 @@ compile_rules(<< $[, Rest/binary >>, S, Segments, Rules, <<>>) ->
compile_brackets(Rest, S, Segments, Rules); compile_brackets(Rest, S, Segments, Rules);
%% Open bracket in the middle of a segment. %% Open bracket in the middle of a segment.
compile_rules(<< $[, _/binary >>, _, _, _, _) -> compile_rules(<< $[, _/binary >>, _, _, _, _) ->
erlang:error(badarg); error(badarg);
%% Missing an open bracket. %% Missing an open bracket.
compile_rules(<< $], _/binary >>, _, _, _, _) -> compile_rules(<< $], _/binary >>, _, _, _, _) ->
erlang:error(badarg); error(badarg);
compile_rules(<< C, Rest/binary >>, S, Segments, Rules, Acc) -> compile_rules(<< C, Rest/binary >>, S, Segments, Rules, Acc) ->
compile_rules(Rest, S, Segments, Rules, << Acc/binary, C >>). compile_rules(Rest, S, Segments, Rules, << Acc/binary, C >>).
%% Everything past $: until the segment separator ($. for hosts, %% Everything past $: until the segment separator ($. for hosts,
%% $/ for paths) or $[ or $] or end of binary is the binding name. %% $/ for paths) or $[ or $] or end of binary is the binding name.
compile_binding(<<>>, _, <<>>) -> compile_binding(<<>>, _, <<>>) ->
erlang:error(badarg); error(badarg);
compile_binding(Rest = <<>>, _, Acc) -> compile_binding(Rest = <<>>, _, Acc) ->
{Acc, Rest}; {Acc, Rest};
compile_binding(Rest = << C, _/binary >>, S, Acc) compile_binding(Rest = << C, _/binary >>, S, Acc)
@ -144,7 +144,7 @@ compile_brackets(Rest, S, Segments, Rules) ->
%% Missing a close bracket. %% Missing a close bracket.
compile_brackets_split(<<>>, _, _) -> compile_brackets_split(<<>>, _, _) ->
erlang:error(badarg); error(badarg);
%% Make sure we don't confuse the closing bracket we're looking for. %% Make sure we don't confuse the closing bracket we're looking for.
compile_brackets_split(<< C, Rest/binary >>, Acc, N) when C =:= $[ -> compile_brackets_split(<< C, Rest/binary >>, Acc, N) when C =:= $[ ->
compile_brackets_split(Rest, << Acc/binary, C >>, N + 1); compile_brackets_split(Rest, << Acc/binary, C >>, N + 1);

10
test/http_SUITE_data/http_errors.erl
View file

@ -10,11 +10,11 @@ init({_Transport, http}, Req, _Opts) ->
case_init(<<"init_before_reply">> = Case, _Req) -> case_init(<<"init_before_reply">> = Case, _Req) ->
cowboy_error_h:ignore(?MODULE, case_init, 2), cowboy_error_h:ignore(?MODULE, case_init, 2),
erlang:error(Case); error(Case);
case_init(<<"init_after_reply">> = Case, Req) -> case_init(<<"init_after_reply">> = Case, Req) ->
cowboy_error_h:ignore(?MODULE, case_init, 2), cowboy_error_h:ignore(?MODULE, case_init, 2),
_ = cowboy_req:reply(200, [], "http_handler_crashes", Req), _ = cowboy_req:reply(200, [], "http_handler_crashes", Req),
erlang:error(Case); error(Case);
case_init(<<"init_reply_handle_error">> = Case, Req) -> case_init(<<"init_reply_handle_error">> = Case, Req) ->
Req1 = cowboy_req:reply(200, [], "http_handler_crashes", Req), Req1 = cowboy_req:reply(200, [], "http_handler_crashes", Req),
{ok, Req1, Case}; {ok, Req1, Case};
@ -25,14 +25,14 @@ case_init(<<"handle_after_reply">> = Case, Req) ->
handle(_Req, <<"init_reply_handle_error">> = Case) -> handle(_Req, <<"init_reply_handle_error">> = Case) ->
cowboy_error_h:ignore(?MODULE, handle, 2), cowboy_error_h:ignore(?MODULE, handle, 2),
erlang:error(Case); error(Case);
handle(_Req, <<"handle_before_reply">> = Case) -> handle(_Req, <<"handle_before_reply">> = Case) ->
cowboy_error_h:ignore(?MODULE, handle, 2), cowboy_error_h:ignore(?MODULE, handle, 2),
erlang:error(Case); error(Case);
handle(Req, <<"handle_after_reply">> = Case) -> handle(Req, <<"handle_after_reply">> = Case) ->
cowboy_error_h:ignore(?MODULE, handle, 2), cowboy_error_h:ignore(?MODULE, handle, 2),
_ = cowboy_req:reply(200, [], "http_handler_crashes", Req), _ = cowboy_req:reply(200, [], "http_handler_crashes", Req),
erlang:error(Case). error(Case).
terminate(_, _, _) -> terminate(_, _, _) ->
ok. ok.