yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Detete emqx_protocol:rc to fix ci

This commit is contained in:
Gilbert Wong 2019-03-30 11:02:42 +08:00
parent 67d7ade1f5 8be2defb6b
commit c2d561a725
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -9,7 +9,7 @@ dep_jsx = git-emqx https://github.com/talentdeficit/jsx 2.9.0
dep_gproc = git-emqx https://github.com/uwiger/gproc 0.8.0 dep_gproc = git-emqx https://github.com/uwiger/gproc 0.8.0
dep_gen_rpc = git-emqx https://github.com/emqx/gen_rpc 2.3.1 dep_gen_rpc = git-emqx https://github.com/emqx/gen_rpc 2.3.1
dep_esockd = git-emqx https://github.com/emqx/esockd v5.4.4 dep_esockd = git-emqx https://github.com/emqx/esockd v5.4.4
dep_ekka = git-emqx https://github.com/emqx/ekka v0.5.3 dep_ekka = git-emqx https://github.com/emqx/ekka v0.5.4
dep_cowboy = git-emqx https://github.com/ninenines/cowboy 2.6.1 dep_cowboy = git-emqx https://github.com/ninenines/cowboy 2.6.1
dep_replayq = git-emqx https://github.com/emqx/replayq v0.1.1 dep_replayq = git-emqx https://github.com/emqx/replayq v0.1.1

6
rebar.config
View File

@ -7,10 +7,10 @@
%% appended to deps in rebar.config.script %% appended to deps in rebar.config.script
{github_emqx_deps, {github_emqx_deps,
[{gen_rpc, "2.3.1"}, [{gen_rpc, "2.3.1"},
{cuttlefish, "v2.2.1"}, {ekka, "v0.5.4"},
{ekka, "v0.5.3"},
{replayq, "v0.1.1"}, {replayq, "v0.1.1"},
{esockd, "v5.4.4"} {esockd, "v5.4.4"},
{cuttlefish, "v2.2.1"}
]}. ]}.
{edoc_opts, [{preprocess, true}]}. {edoc_opts, [{preprocess, true}]}.

8
src/emqx_protocol.erl
View File

@ -906,14 +906,6 @@ start_keepalive(Secs, #pstate{zone = Zone}) when Secs > 0 ->
Backoff = emqx_zone:get_env(Zone, keepalive_backoff, 0.75), Backoff = emqx_zone:get_env(Zone, keepalive_backoff, 0.75),
self() ! {keepalive, start, round(Secs * Backoff)}. self() ! {keepalive, start, round(Secs * Backoff)}.
rc(Reason) ->
case Reason of
protocol_error -> ?RC_PROTOCOL_ERROR;
topic_filters_invalid -> ?RC_TOPIC_FILTER_INVALID;
topic_name_invalid -> ?RC_TOPIC_NAME_INVALID;
_ -> ?RC_MALFORMED_PACKET
end.
%%----------------------------------------------------------------------------- %%-----------------------------------------------------------------------------
%% Parse topic filters %% Parse topic filters
%%----------------------------------------------------------------------------- %%-----------------------------------------------------------------------------