Merge branch 'master' of github.com:emqtt/emqtt

CHANGELOG.md

@@ -2,13 +2,15 @@
 emqttd ChangeLog
 ==================
 
-0.6.2-alpha (2015-04-23)
+0.6.2-alpha (2015-04-24)
 -------------------------
 
 Bugfix: critical issue #54, #104, #106 - error when resume session 
 
 Improve: add emqttd_cm_sup module, and use 'hash' gproc_pool to register/unregister client ids
 
+Improve: kick old client out when session is duplicated.
+
 
 0.6.1-alpha (2015-04-20)
 -------------------------

rel/files/app.config

@@ -7,9 +7,6 @@
  {sasl, [
 	{sasl_error_logger, {file, "log/emqttd_sasl.log"}}
  ]},
- {mnesia, [
-	{dir, "data/mnesia"}
- ]},
  {ssl, [
     %{versions, ['tlsv1.2', 'tlsv1.1']}
  ]},

rel/files/vm.args

@@ -1,9 +1,20 @@
+##-------------------------------------------------------------------------
 ## Name of the node
+##-------------------------------------------------------------------------
 -name emqttd@127.0.0.1
 
 ## Cookie for distributed erlang
 -setcookie emqttdsecretcookie
 
+##-------------------------------------------------------------------------
+## Mnesia db
+##-------------------------------------------------------------------------
+-mnesia dir "data/mnesia/test"
+
+##-------------------------------------------------------------------------
+## Flags
+##-------------------------------------------------------------------------
+
 ## Heartbeat management; auto-restarts VM if it dies or becomes unresponsive
 ## (Disabled by default..use with caution!)
 ##-heart
@@ -16,6 +27,10 @@
 ## max process numbers
 +P 1000000
 
+##-------------------------------------------------------------------------
+## Env
+##-------------------------------------------------------------------------
+
 ## Increase number of concurrent ports/sockets
 -env ERL_MAX_PORTS 4096