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

Merge pull request #757 from emqtt/emq20 

Fix issue #754 and open 8884 port(wss) by default
This commit is contained in:
turtleDeng 2016-11-09 10:04:49 +08:00 committed by GitHub
parent 91eb89be2b 06f5c8e2b7
commit e55bc26a93
2 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
etc/emq.conf
View File

@ -11,6 +11,11 @@ node.cookie = emq_dist_cookie
## SMP support: enable, auto, disable ## SMP support: enable, auto, disable
node.smp = auto node.smp = auto
## vm.args: -heart
## Heartbeat monitoring of an Erlang runtime system
## Value should be 'on' or comment the line
## node.heartbeat = on
## Enable kernel poll ## Enable kernel poll
node.kernel_poll = on node.kernel_poll = on
@ -219,12 +224,12 @@ mqtt.listener.http.acceptors = 4
mqtt.listener.http.max_clients = 64 mqtt.listener.http.max_clients = 64
## HTTP(SSL) Listener ## HTTP(SSL) Listener
## mqtt.listener.https = 8084 mqtt.listener.https = 8084
## mqtt.listener.https.acceptors = 4 mqtt.listener.https.acceptors = 4
## mqtt.listener.https.max_clients = 64 mqtt.listener.https.max_clients = 64
## mqtt.listener.https.handshake_timeout = 15 mqtt.listener.https.handshake_timeout = 15
## mqtt.listener.https.certfile = etc/certs/cert.pem mqtt.listener.https.certfile = etc/certs/cert.pem
## mqtt.listener.https.keyfile = etc/certs/key.pem mqtt.listener.https.keyfile = etc/certs/key.pem
## mqtt.listener.https.cacertfile = etc/certs/cacert.pem ## mqtt.listener.https.cacertfile = etc/certs/cacert.pem
## mqtt.listener.https.verify = verify_peer ## mqtt.listener.https.verify = verify_peer
## mqtt.listener.https.fail_if_no_peer_cert = true ## mqtt.listener.https.fail_if_no_peer_cert = true

15
priv/emq.schema
View File

@ -22,6 +22,19 @@
hidden hidden
]}. ]}.
%% @doc http://erlang.org/doc/man/heart.html
{mapping, "node.heartbeat", "vm_args.-heart", [
{datatype, flag},
hidden
]}.
{translation, "vm_args.-heart", fun(Conf) ->
case cuttlefish:conf_get("node.heartbeat", Conf) of
true -> "";
false -> cuttlefish:invalid("should be 'on' or comment the line!")
end
end}.
%% @doc Enable Kernel Poll %% @doc Enable Kernel Poll
{mapping, "node.kernel_poll", "vm_args.+K", [ {mapping, "node.kernel_poll", "vm_args.+K", [
{default, on}, {default, on},
@ -338,7 +351,7 @@ end}.
%% @doc Max queue length. Enqueued messages when persistent client disconnected, or inflight window is full. %% @doc Max queue length. Enqueued messages when persistent client disconnected, or inflight window is full.
{mapping, "mqtt.queue.max_length", "emqttd.queue", [ {mapping, "mqtt.queue.max_length", "emqttd.queue", [
{default, infinity}, {default, infinity},
{datatype, [atom, integer]} {datatype, [integer, {atom, infinity}]}
]}. ]}.
%% @doc Low-water mark of queued messages %% @doc Low-water mark of queued messages