From 4888702712de028d84f528acd20260d80a517555 Mon Sep 17 00:00:00 2001 From: turtled Date: Mon, 12 Jun 2017 15:13:54 +0800 Subject: [PATCH] Remove bridge command qos option --- src/emqttd_bridge.erl | 6 +----- src/emqttd_cli.erl | 3 --- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/emqttd_bridge.erl b/src/emqttd_bridge.erl index 815ee38d9..49b5a95d0 100644 --- a/src/emqttd_bridge.erl +++ b/src/emqttd_bridge.erl @@ -37,7 +37,6 @@ -record(state, {pool, id, node, subtopic, - qos = ?QOS_0, topic_suffix = <<>>, topic_prefix = <<>>, mqueue :: emqttd_mqueue:mqueue(), @@ -45,8 +44,7 @@ ping_down_interval = ?PING_DOWN_INTERVAL, status = up}). --type(option() :: {qos, mqtt_qos()} | - {topic_suffix, binary()} | +-type(option() :: {topic_suffix, binary()} | {topic_prefix, binary()} | {max_queue_len, pos_integer()} | {ping_down_interval, pos_integer()}). @@ -87,8 +85,6 @@ init([Pool, Id, Node, Topic, Options]) -> parse_opts([], State) -> State; -parse_opts([{qos, Qos} | Opts], State) -> - parse_opts(Opts, State#state{qos = Qos}); parse_opts([{topic_suffix, Suffix} | Opts], State) -> parse_opts(Opts, State#state{topic_suffix= Suffix}); parse_opts([{topic_prefix, Prefix} | Opts], State) -> diff --git a/src/emqttd_cli.erl b/src/emqttd_cli.erl index 8123fe669..6918c68e8 100644 --- a/src/emqttd_cli.erl +++ b/src/emqttd_cli.erl @@ -326,7 +326,6 @@ bridges(["list"]) -> bridges(["options"]) -> ?PRINT_MSG("Options:~n"), - ?PRINT_MSG(" qos = 0 | 1 | 2~n"), ?PRINT_MSG(" prefix = string~n"), ?PRINT_MSG(" suffix = string~n"), ?PRINT_MSG(" queue = integer~n"), @@ -363,8 +362,6 @@ parse_opts(Cmd, OptStr) -> Tokens = string:tokens(OptStr, ","), [parse_opt(Cmd, list_to_atom(Opt), Val) || [Opt, Val] <- [string:tokens(S, "=") || S <- Tokens]]. -parse_opt(bridge, qos, Qos) -> - {qos, list_to_integer(Qos)}; parse_opt(bridge, suffix, Suffix) -> {topic_suffix, bin(Suffix)}; parse_opt(bridge, prefix, Prefix) ->