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

Fix wrong config entries

This commit is contained in:
Gilbert Wong 2019-02-28 11:08:13 +08:00
parent 911a813891
commit d18f4ba550
3 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
etc/emqx.conf
View File

@ -1723,16 +1723,21 @@ listener.wss.external.ciphers = ECDHE-ECDSA-AES256-GCM-SHA384,ECDHE-RSA-AES256-G
## Inflight size. ## Inflight size.
## ##
## Value: Integer ## Value: Integer
## bridge.aws.max_inflight = 32 ## bridge.aws.max_inflight_batches = 32
## Maximum number of messages in one batch when sending to remote borkers ## Max number of messages to collect in a batch for
## NOTE: when bridging via MQTT connection to remote broker, this config is only ## each send call towards emqx_portal_connect
## used for internal message passing optimization as the underlying MQTT
## protocol does not supports batching.
## ##
## Value: Integer ## Value: Integer
## default: 32 ## default: 32
## bridge.aws.queue.batch_size = 32 ## bridge.aws.queue.batch_count_limit = 32
## Max number of bytes to collect in a batch for each
## send call towards emqx_portal_connect
##
## Value: Bytesize
## default: 1000M
## bridge.aws.queue.batch_bytes_limit = 1000MB
## Base directory for replayq to store messages on disk ## Base directory for replayq to store messages on disk
## If this config entry is missing or set to undefined, ## If this config entry is missing or set to undefined,
@ -1767,7 +1772,7 @@ listener.wss.external.ciphers = ECDHE-ECDSA-AES256-GCM-SHA384,ECDHE-RSA-AES256-G
## The ClientId of a remote bridge. ## The ClientId of a remote bridge.
## ##
## Value: String ## Value: String
## bridge.azure.client_id = bridge_aws ## bridge.azure.client_id = bridge_azure
## The Clean start flag of a remote bridge. ## The Clean start flag of a remote bridge.
## ##
@ -1876,7 +1881,7 @@ listener.wss.external.ciphers = ECDHE-ECDSA-AES256-GCM-SHA384,ECDHE-RSA-AES256-G
## Inflight size. ## Inflight size.
## ##
## Value: Integer ## Value: Integer
## bridge.azure.max_inflight = 32 ## bridge.azure.max_inflight_batches = 32
## Maximum number of messages in one batch when sending to remote borkers ## Maximum number of messages in one batch when sending to remote borkers
## NOTE: when bridging via MQTT connection to remote broker, this config is only ## NOTE: when bridging via MQTT connection to remote broker, this config is only

8
priv/emqx.schema
View File

@ -1600,15 +1600,19 @@ end}.
{datatype, {duration, ms}} {datatype, {duration, ms}}
]}. ]}.
{mapping, "bridge.$name.max_inflight", "emqx.bridges", [ {mapping, "bridge.$name.max_inflight_batches", "emqx.bridges", [
{default, 0}, {default, 0},
{datatype, integer} {datatype, integer}
]}. ]}.
{mapping, "bridge.$name.queue.batch_size", "emqx.bridges", [ {mapping, "bridge.$name.queue.batch_count_limit", "emqx.bridges", [
{datatype, integer} {datatype, integer}
]}. ]}.
{mapping, "bridge.$name.queue.batch_bytes_limit", "emqx.bridges", [
{datatype, bytesize}
]}.
{mapping, "bridge.$name.queue.replayq_dir", "emqx.bridges", [ {mapping, "bridge.$name.queue.replayq_dir", "emqx.bridges", [
{datatype, string} {datatype, string}
]}. ]}.

4
src/portal/emqx_portal.erl
View File

@ -114,9 +114,9 @@
%% queue.batch_bytes_limit: Max number of bytes to collect in a batch for each %% queue.batch_bytes_limit: Max number of bytes to collect in a batch for each
%% send call towards emqx_portal_connect %% send call towards emqx_portal_connect
%% queue.batch_count_limit: Max number of messages to collect in a batch for %% queue.batch_count_limit: Max number of messages to collect in a batch for
%% each send call towards eqmx_portal_connect %% each send call towards emqx_portal_connect
%% queue.replayq_dir: Directory where replayq should persist messages %% queue.replayq_dir: Directory where replayq should persist messages
%% queue.replayq_seg_bytes: Size in bytes for each replqyq segnment file %% queue.replayq_seg_bytes: Size in bytes for each replayq segment file
%% %%
%% Find more connection specific configs in the callback modules %% Find more connection specific configs in the callback modules
%% of emqx_portal_connect behaviour. %% of emqx_portal_connect behaviour.