From e88fe8b6ae276e707f5b2874ec4a975922d5aabd Mon Sep 17 00:00:00 2001
From: Feng <ery.lee@gmail.com>
Date: Mon, 21 Mar 2016 10:08:59 +0800
Subject: [PATCH] fix issue #479

---
 rel/files/emqttd.config.development | 11 ++++++-----
 rel/files/emqttd.config.production  | 11 ++++++-----
 src/emqttd_session.erl              |  2 +-
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/rel/files/emqttd.config.development b/rel/files/emqttd.config.development
index c655b3c3c..32424846b 100644
--- a/rel/files/emqttd.config.development
+++ b/rel/files/emqttd.config.development
@@ -104,8 +104,8 @@
             %% Statistics Collection Interval(seconds)
             {collect_interval, 20},
 
-            %% Expired after 2 days
-            {expired_after, 48}
+            %% Expired after 2 day (unit: minute)
+            {expired_after, 2880}
 
         ]},
         %% Queue
@@ -176,11 +176,12 @@
 
         %% Subscribe topics automatically when client connected
         {subscription, [
-            %% Static subscriptions from backend
-            backend,
 
             %% $c will be replaced by clientid
-            {"$queue/clients/$c", 1}
+            %% {"$queue/clients/$c", 1},
+
+            %% Static subscriptions from backend
+            backend
         ]}
 
         %% Rewrite rules
diff --git a/rel/files/emqttd.config.production b/rel/files/emqttd.config.production
index 837238c4f..df0a0da6e 100644
--- a/rel/files/emqttd.config.production
+++ b/rel/files/emqttd.config.production
@@ -96,8 +96,8 @@
             %% Statistics Collection Interval(seconds)
             {collect_interval, 0},
 
-            %% Expired after 2 days
-            {expired_after, 48}
+            %% Expired after 2 day (unit: minute)
+            {expired_after, 2880}
 
         ]},
         %% Queue
@@ -168,11 +168,12 @@
 
         %% Subscribe topics automatically when client connected
         {subscription, [
-            %% Static subscriptions from backend
-            backend,
 
             %% $c will be replaced by clientid
-            {"$queue/clients/$c", 1}
+            %% {"$queue/clients/$c", 1},
+
+            %% Static subscriptions from backend
+            backend
         ]}
 
         %% Rewrite rules
diff --git a/src/emqttd_session.erl b/src/emqttd_session.erl
index ff15e415c..ac7af465b 100644
--- a/src/emqttd_session.erl
+++ b/src/emqttd_session.erl
@@ -230,7 +230,7 @@ init([CleanSess, ClientId, ClientPid]) ->
             retry_interval    = get_value(unack_retry_interval, SessEnv),
             await_rel_timeout = get_value(await_rel_timeout, SessEnv),
             max_awaiting_rel  = get_value(max_awaiting_rel, SessEnv),
-            expired_after     = get_value(expired_after, SessEnv) * 3600,
+            expired_after     = get_value(expired_after, SessEnv) * 60,
             collect_interval  = get_value(collect_interval, SessEnv, 0),
             timestamp         = os:timestamp()},
     emqttd_sm:register_session(CleanSess, ClientId, sess_info(Session)),