From c626eadad45854c59ab166e26b11bcffd1130bd7 Mon Sep 17 00:00:00 2001 From: Feng Date: Fri, 11 Mar 2016 23:46:27 +0800 Subject: [PATCH] 0.17.0 config --- rel/files/emqttd.config.development | 9 +++------ rel/files/emqttd.config.production | 22 ++++++++-------------- rel/files/emqttd.test.config | 17 ++++------------- 3 files changed, 15 insertions(+), 33 deletions(-) diff --git a/rel/files/emqttd.config.development b/rel/files/emqttd.config.development index 9fce5b427..d0666ae46 100644 --- a/rel/files/emqttd.config.development +++ b/rel/files/emqttd.config.development @@ -79,7 +79,7 @@ %% Max ClientId Length Allowed {max_clientid_len, 1024}, %% Max Packet Size Allowed, 64K default - {max_packet_size, 65536} + {max_packet_size, 65536} ]}, %% Client {client, [ @@ -176,11 +176,8 @@ %% Static subscriptions from backend backend, - %% $u will be replaced with username - {"$Q/username/$u", 1}, - - %% $c will be replaced with clientid - {"$Q/client/$c", 1} + %% $c will be replaced by clientid + {"$queue/clients/$c", 1} ]} %% Rewrite rules diff --git a/rel/files/emqttd.config.production b/rel/files/emqttd.config.production index 095c66550..b1ad6122b 100644 --- a/rel/files/emqttd.config.production +++ b/rel/files/emqttd.config.production @@ -77,9 +77,6 @@ {client, [ %% Socket is connected, but no 'CONNECT' packet received {idle_timeout, 20} %% seconds - %TODO: Network ingoing limit - %{ingoing_rate_limit, '64KB/s'} - %TODO: Reconnet control ]}, %% Session {session, [ @@ -164,19 +161,16 @@ {modules, [ %% Client presence management module. %% Publish messages when client connected or disconnected - {presence, [{qos, 0}]} + {presence, [{qos, 0}]}, %% Subscribe topics automatically when client connected - %% {subscription, [ - %% %% Static subscriptions from backend - %% backend, - %% - %% %% $u will be replaced with username - %% {"$Q/username/$u", 1}, - %% - %% %% $c will be replaced with clientid - %% {"$Q/client/$c", 1} - %% ]} + {subscription, [ + %% Static subscriptions from backend + backend, + + %% $c will be replaced by clientid + {"$queue/clients/$c", 1} + ]} %% Rewrite rules %% {rewrite, [{file, "etc/rewrite.config"}]} diff --git a/rel/files/emqttd.test.config b/rel/files/emqttd.test.config index 496648af6..f837d07ac 100644 --- a/rel/files/emqttd.test.config +++ b/rel/files/emqttd.test.config @@ -151,15 +151,6 @@ {pubsub, [ %% Default should be scheduler numbers {pool_size, 8}, - - %% Subscription: disc | ram | false - {subscription, ram}, - - %% Route shard - {route_shard, false}, - - %% Route delay, false | integer - {route_delay, false}, %% Route aging time(seconds) {route_aging, 5} @@ -182,14 +173,14 @@ %% Subscribe topics automatically when client connected {subscription, [ - %% Subscription from stored table - stored, + %% Static subscriptions from backend + backend, %% $u will be replaced with username - {"$Q/username/$u", 1}, + {"$queue/username/$u", 1}, %% $c will be replaced with clientid - {"$Q/client/$c", 1} + {"$queue/clients/$c", 1} ]} %% Rewrite rules