瀏覽代碼

0.17.0 config

Feng 10 年之前
父節點
當前提交
c626eadad4
共有 3 個文件被更改,包括 15 次插入33 次删除
  1. 3 6
      rel/files/emqttd.config.development
  2. 8 14
      rel/files/emqttd.config.production
  3. 4 13
      rel/files/emqttd.test.config

+ 3 - 6
rel/files/emqttd.config.development

@@ -79,7 +79,7 @@
             %% Max ClientId Length Allowed
             %% Max ClientId Length Allowed
             {max_clientid_len, 1024},
             {max_clientid_len, 1024},
             %% Max Packet Size Allowed, 64K default
             %% Max Packet Size Allowed, 64K default
-            {max_packet_size,  65536}
+            {max_packet_size, 65536}
         ]},
         ]},
         %% Client
         %% Client
         {client, [
         {client, [
@@ -176,11 +176,8 @@
             %% Static subscriptions from backend
             %% Static subscriptions from backend
             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
         %% Rewrite rules

+ 8 - 14
rel/files/emqttd.config.production

@@ -77,9 +77,6 @@
         {client, [
         {client, [
             %% Socket is connected, but no 'CONNECT' packet received
             %% Socket is connected, but no 'CONNECT' packet received
             {idle_timeout, 20} %% seconds
             {idle_timeout, 20} %% seconds
-            %TODO: Network ingoing limit
-            %{ingoing_rate_limit, '64KB/s'}
-            %TODO: Reconnet control
         ]},
         ]},
         %% Session
         %% Session
         {session, [
         {session, [
@@ -164,19 +161,16 @@
     {modules, [
     {modules, [
         %% Client presence management module.
         %% Client presence management module.
         %% Publish messages when client connected or disconnected
         %% Publish messages when client connected or disconnected
-        {presence, [{qos, 0}]}
+        {presence, [{qos, 0}]},
 
 
         %% Subscribe topics automatically when client connected
         %% 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 rules
         %% {rewrite, [{file, "etc/rewrite.config"}]}
         %% {rewrite, [{file, "etc/rewrite.config"}]}

+ 4 - 13
rel/files/emqttd.test.config

@@ -151,15 +151,6 @@
         {pubsub, [
         {pubsub, [
             %% Default should be scheduler numbers
             %% Default should be scheduler numbers
             {pool_size, 8},
             {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 time(seconds)
             {route_aging, 5}
             {route_aging, 5}
@@ -182,14 +173,14 @@
 
 
         %% Subscribe topics automatically when client connected
         %% Subscribe topics automatically when client connected
         {subscription, [
         {subscription, [
-            %% Subscription from stored table
-            stored,
+            %% Static subscriptions from backend
+            backend,
 
 
             %% $u will be replaced with username
             %% $u will be replaced with username
-            {"$Q/username/$u", 1},
+            {"$queue/username/$u", 1},
 
 
             %% $c will be replaced with clientid
             %% $c will be replaced with clientid
-            {"$Q/client/$c", 1}
+            {"$queue/clients/$c", 1}
         ]}
         ]}
 
 
         %% Rewrite rules
         %% Rewrite rules