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

conflicts fixed

This commit is contained in:
turtled 2017-06-09 14:55:03 +08:00
parent 1a8cc2e146 034f39e811
commit 866c33f6fc
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile
View File

@ -14,6 +14,7 @@ dep_pbkdf2 = git https://github.com/emqtt/pbkdf2 2.0.1
dep_lager_syslog = git https://github.com/basho/lager_syslog dep_lager_syslog = git https://github.com/basho/lager_syslog
dep_bcrypt = git https://github.com/smarkets/erlang-bcrypt master dep_bcrypt = git https://github.com/smarkets/erlang-bcrypt master
ERLC_OPTS += +debug_info
ERLC_OPTS += +'{parse_transform, lager_transform}' ERLC_OPTS += +'{parse_transform, lager_transform}'
NO_AUTOPATCH = cuttlefish NO_AUTOPATCH = cuttlefish

2
etc/emq.conf
View File

@ -191,7 +191,7 @@ mqtt.mqueue.type = simple
## Max queue length. Enqueued messages when persistent client disconnected, ## Max queue length. Enqueued messages when persistent client disconnected,
## or inflight window is full. 0 means no limit. ## or inflight window is full. 0 means no limit.
mqtt.mqueue.max_length = 0 mqtt.mqueue.max_length = 1000
## Low-water mark of queued messages ## Low-water mark of queued messages
mqtt.mqueue.low_watermark = 20% mqtt.mqueue.low_watermark = 20%