yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

This commit is contained in:
Feng Lee 2015-04-24 12:24:42 +08:00
parent 0c2ef05339 17b537b8c1
commit 5012a86ca7
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -2,13 +2,15 @@
emqttd ChangeLog 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 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: 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) 0.6.1-alpha (2015-04-20)
------------------------- -------------------------

3
rel/files/app.config
View File

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

15
rel/files/vm.args
View File

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