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

Merge branch 'emq20'

This commit is contained in:
Feng 2016-09-10 16:18:30 +08:00
parent 66494ddcc0 9f68cfec01
commit 28675d7451
5 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/source/cluster.rst
View File

@ -161,7 +161,7 @@ Suppose we deploy two nodes cluster on s1.emqtt.io, s2.emqtt.io:
emqttd@s1.emqtt.io setting emqttd@s1.emqtt.io setting
-------------------------- --------------------------
emqttd/etc/vm.args:: emqttd/releases/2.0/vm.args::
-name emqttd@s1.emqtt.io -name emqttd@s1.emqtt.io
@ -174,7 +174,7 @@ emqttd/etc/vm.args::
emqttd@s2.emqtt.io setting emqttd@s2.emqtt.io setting
-------------------------- --------------------------
emqttd/etc/vm.args:: emqttd/releases/2.0/vm.args::
-name emqttd@s2.emqtt.io -name emqttd@s2.emqtt.io

18
docs/source/config.rst
View File

@ -7,13 +7,13 @@ Configuration
The two main configuration files of the broker are under 'etc/' folder: The two main configuration files of the broker are under 'etc/' folder:
+-------------------+-----------------------------------+ +----------------------+-----------------------------------+
| File | Description | | File | Description |
+-------------------+-----------------------------------+ +----------------------+-----------------------------------+
| etc/vm.args | Erlang VM Arguments | | releases/2.0/vm.args | Erlang VM Arguments |
+-------------------+-----------------------------------+ +----------------------+-----------------------------------+
| etc/emqttd.conf | emqttd broker Config | | etc/emqttd.conf | emqttd broker Config |
+-------------------+-----------------------------------+ +----------------------+-----------------------------------+
---------------------------- ----------------------------
Plugins' Configuration Files Plugins' Configuration Files
@ -65,9 +65,9 @@ The modules' configuration files are in etc/modules/ folder, and referrenced by
| etc/ssl/* | SSL Certfile and Keyfile | | etc/ssl/* | SSL Certfile and Keyfile |
+-----------------------------+----------------------------------+ +-----------------------------+----------------------------------+
----------- --------------------
etc/vm.args releases/2.0/vm.args
----------- --------------------
Configure and Optimize Erlang VM:: Configure and Optimize Erlang VM::
@ -127,7 +127,7 @@ Configure and Optimize Erlang VM::
## Tweak GC to run more often ## Tweak GC to run more often
-env ERL_FULLSWEEP_AFTER 1000 -env ERL_FULLSWEEP_AFTER 1000
The two most important parameters in etc/vm.args: The two most important parameters in releases/2.0/vm.args:
+-------+---------------------------------------------------------------------------+ +-------+---------------------------------------------------------------------------+
| +P | Max number of Erlang proccesses. A MQTT client consumes two proccesses. | | +P | Max number of Erlang proccesses. A MQTT client consumes two proccesses. |

2
docs/source/getstarted.rst
View File

@ -220,7 +220,7 @@ TCP Stack Parameters
Erlang VM Erlang VM
--------- ---------
emqttd/etc/vm.args:: emqttd/release/2.0/vm.args::
## max process numbers ## max process numbers
+P 2097152 +P 2097152

10
docs/source/install.rst
View File

@ -253,13 +253,13 @@ Quick Setup
Two main configuration files of the emqttd broker: Two main configuration files of the emqttd broker:
+-------------------+-----------------------------------+ +-----------------------+-----------------------------------+
| etc/vm.args | Erlang VM Arguments | | releases/2.0/vm.args | Erlang VM Arguments |
+-------------------+-----------------------------------+ +-----------------------+-----------------------------------+
| etc/emqttd.conf | emqttd broker Config | | etc/emqttd.conf | emqttd broker Config |
+-------------------+-----------------------------------+ +-----------------------+-----------------------------------+
Two important parameters in etc/vm.args: Two important parameters in releases/2.0/vm.args:
+-------+---------------------------------------------------------------------------+ +-------+---------------------------------------------------------------------------+
| +P | Max number of Erlang proccesses. A MQTT client consumes two proccesses. | | +P | Max number of Erlang proccesses. A MQTT client consumes two proccesses. |

3
docs/source/tune.rst
View File

@ -89,7 +89,7 @@ Timeout for FIN-WAIT-2 sockets::
Erlang VM Tuning Erlang VM Tuning
---------------- ----------------
Tuning and optimize the Erlang VM in etc/vm.args file:: Tuning and optimize the Erlang VM in releases/2.0/vm.args file::
## max number of erlang processes ## max number of erlang processes
+P 2097152 +P 2097152
@ -149,3 +149,4 @@ emqtt_benchmark
--------------- ---------------
Test tool for concurrent connections: http://github.com/emqtt/emqtt_benchmark Test tool for concurrent connections: http://github.com/emqtt/emqtt_benchmark