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

Merge branch 'master' into 0.16

This commit is contained in:
Feng 2016-02-16 02:56:59 +08:00
parent 6930439158 e030454466
commit 757d1f5fc5
2 changed files with 16 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
CHANGELOG.md
View File

@ -38,30 +38,30 @@ noproc error when call to gen_server2:call(false, {add_route,Topic,<0.685.0>}, i
Changed the license of all plugins. Changed the license of all plugins.
0.15.0-beta(2016-01-28) 0.15.0-beta (2016-01-31)
------------------------- ------------------------
#### Highlights #### Highlights
Optimize for Push Application, 500K+ Subscribers to a Topic.
Optimization for Route ETS insertion (#427) Optimization for Route ETS insertion (#427)
Add Mongodb, Redis Plugins Priority Message Queue for Persistent Session (#432)
Priority Message Queue Support
ReadTheDocs
Add Redis, MongoDB Plugins (#417)
#### Enhancements #### Enhancements
Join/Leave the Cluster Username/Password Authentication: Support to configure default users (#428)
Username Authentication: Default Users Improve CLI Commands: pubsub, bridges, trace (#429)
Improve Cli commands: pubsub, bridges, trace
emqttd_mod_subscription: fix client_connected/3 emqttd_mod_subscription: fix client_connected/3
emqttd_auth_mod: add passwd_hash/2 function
priority_queue: add plen/2, out/2 functions
#### BugFix #### BugFix
@ -69,19 +69,15 @@ Fix dequeue/1 of emqttd_bridge...
Add emqttd:seed_now/0 function Add emqttd:seed_now/0 function
#### Plugins #### Plugins
emqttd_plubin_mysql: changed mysql driver to mysql-otp emqttd_plubin_mysql: Changed mysql driver to mysql-otp
emqttd_plugin_pgsql: integrate with ecpool emqttd_plugin_pgsql: Integrate with ecpool
emqttd_plugin_redis: first release emqttd_plugin_redis: First release
emqttd_plugin_mongo: first release emqttd_plugin_mongo: First release
#### Benchmark
0.14.1-beta(2015-12-28) 0.14.1-beta(2015-12-28)

2
src/emqttd_pubsub_sup.erl
View File

@ -48,7 +48,7 @@ init([Env]) ->
%% Router Pool Sup %% Router Pool Sup
RouterMFA = {emqttd_router, start_link, [fun setstats/1, Env]}, RouterMFA = {emqttd_router, start_link, [fun setstats/1, Env]},
%% Pool_size / 2 %% Pool_size / 2
RouterSup = emqttd_pool_sup:spec(router_pool, [router, hash, pool_size(Env) div 2, RouterMFA]), RouterSup = emqttd_pool_sup:spec(router_pool, [router, hash, 1 + (pool_size(Env) div 2), RouterMFA]),
%% PubSub Pool Sup %% PubSub Pool Sup
PubSubMFA = {emqttd_pubsub, start_link, [fun setstats/1, Env]}, PubSubMFA = {emqttd_pubsub, start_link, [fun setstats/1, Env]},