e6232665a3
refactor(emqx): ensure app shutdown and reboot order
...
make use of application dependency to ensure start order.
also the same dependency top-sorted for shutdown and reboot order
2021-08-04 08:40:03 +02:00
5d59ac1f02
refactor(logging): delete log headers from all modules
2021-08-01 09:36:59 +02:00
9e97de04c9
chore(plugins): delete emqx_plugins module attributes
2021-07-30 14:32:01 +08:00
918a26e921
feat(conf): merge all conf to emqx.conf
2021-07-02 17:01:16 +08:00
d4f726419f
feat(bridge-mqtt): Update the configuration file to hocon ( #5142 )
2021-07-01 10:51:59 +08:00
faad90c9d4
chore(plugins): rm emqx-web-hook and mv webhook action to emqx_rule_actions
2021-06-28 17:07:46 +08:00
913420588d
Merge branch 'dev/v5.0' into resolve-conflict-to-5.0
2021-05-31 09:17:21 +02:00
c02a9f0101
fix(appup): update appup
2021-05-27 13:55:07 +08:00
d904a1048b
Merge remote-tracking branch 'origin/master' into merge-master-to-dev/v5.0
2021-04-30 15:09:31 +02:00
6354e75626
chore: update copyrights
2021-04-23 20:43:00 +02:00
2ffa71abde
test(emqx_bridge_mqtt): fix race condition
2021-04-20 23:17:39 +02:00
24fdd7aef5
Merge pull request #4526 from zmstone/fix-mqtt-bridge-retry
...
fix(emqx_bridge_mqtt): fix retry_inflight
2021-04-13 12:04:14 +02:00
b0c3c713b5
Merge branch 'master' of github.com:emqx/emqx into merge-master-to-v5
2021-04-13 00:09:17 +09:00
765d84ef48
test(mgmt): add data import tests ( #4481 )
2021-04-12 09:06:22 +08:00
d66f67d411
fix(emqx_bridge_mqtt): fix retry_inflight
...
The Inflight list should not be used to update State.inflight
2021-04-10 14:16:08 +02:00
e4242814f6
fix(emqx_bridge_worker_SUITE): ensure snabbkaffe start stop
2021-04-09 10:18:25 +02:00
ae9278a409
fix(bridge_mqtt): push to max-inflight limit
...
the old pop_and_send implementation may leave inflight queue starving
2021-04-09 10:18:25 +02:00
ae688e2c90
fix(bridge_mqtt): fix inflight reference booking
...
Prior to this change, the inflight batches are referenced
by the last packet ID for non-QoS-0 messages, other packet
IDs sent back from downstream causes an error log:
"Can't be found from the inflight"
Even worse, the batch is appended back to the queue for retry.
2021-04-09 10:18:25 +02:00
971e6ca90e
Merge branch 'master' of github.com:emqx/emqx into merge-master-to-v5
2021-04-07 20:29:08 +09:00
71559dd001
refactor(ssl): Move data dir for ssl certs upload down to lib module
2021-03-22 16:41:01 +01:00
8a41a4ee00
fix(ssl): Fix dir name for uploaded certificates
...
The dir is "rules" not "rule" in the original code
ref: f1eba1c648/src/emqx_rule_actions_utils.erl
2021-03-22 16:41:01 +01:00
efd4ef8091
Merge branch 'dev/v5.0' of private:emqx/emqx into fix-merge-conflict-master-to-5.0
2021-03-04 22:12:09 +09:00
119bbc4881
chore(emqx_bridge_msg): add empty props
2021-03-03 20:06:31 +09:00
2fb5dbd546
revert(bridge-mqtt): remove the mqtt_sub resource
...
We have several reasons to remove this feature:
1. The design does not make sense. A rule engine resource should
not have an impact on the system's messages directly after it is created.
This mqtt_sub actually conflicts with any design concept of the rules engine.
2. The implementation is incorrect. mqtt_sub uses a client pool to establish
a subscription relationship to an MQTT Broker. This causes a message to be
sent repeatedly to EMQ X. Unless a shared subscription is used,
or a Pool Size of 1 is configured.
3. The emqx-bridge-mqtt supports all the features of mqtt_sub.
This feature introduced by https://github.com/emqx/emqx-bridge-mqtt/pull/78 .
And it released to v4.2.0 (NOT WORK), v4.2.1-v4.2.7 (FIXED)
2021-03-02 18:56:21 +08:00
2e199126dc
fix(emqx_bridge_mqtt_actions): string -> file
2021-03-02 15:00:42 +09:00
829a39eade
fix(emqx_bridge_mqtt_actions): string -> password
2021-03-02 15:00:42 +09:00
5edef84332
Merge branch 'dev/v5.0' into fix-merge-conflict-master-to-5.0
2021-03-01 19:58:16 +01:00
990b7bd494
fix(bridge_mqtt): typos
2021-03-01 21:00:17 +08:00
675603fd73
fix(bridge-mqtt): no ssl-option at all (empty list) when ssl is disabled
2021-03-01 21:00:17 +08:00
700fa71754
refactor(tls): abstract lib for tls options parsing
2021-03-01 21:00:17 +08:00
da6f1104dc
chore(bridge-mqtt): sync enterprise code
2021-03-01 21:00:17 +08:00
3863b7f116
fix(config): Quote config string values
2021-02-12 11:16:45 +01:00
d11487268e
Merge remote-tracking branch 'origin/dev/v4.3.0' into resolve-conflict-v4.3.0-to-v5.0
2021-02-12 10:36:16 +01:00
f000b6583c
fix(tls): Ensure tls config integrity
...
For default tsl version and ciphers, we try to use otp release number
to determin if we want to use tlsv1.3
For default configs, we try to porivde both tlsv1.3 and
ciphers in config (even for commented out configs)
2021-02-09 22:56:28 +01:00
4756eb7e5f
Merge branch 'dev/v5.0' into v4.3.0-to-v5.0-resolve-tls-config-conflicts
2021-02-09 09:37:19 +01:00
7c94a02bdd
Merge pull request #4134 from jovdipp/tlsv1.3-as-default
...
Tlsv1.3 as default
2021-02-05 21:33:03 +01:00
5e15e3add8
fix(default-config-tls-ciphers): TLS1.3 exclusive ciphers prepended to TLS1.1+TLS1.2 ciphers
2021-02-05 16:21:28 +13:00
c3c28f4b72
feat(tls.13): tls1.3 ciphers set in .conf's
2021-01-31 18:38:34 +13:00
e8729fb00e
Merge branch 'dev/v5.0' of private:emqx/emqx into merge430
2021-01-29 17:11:12 +09:00
456e3e5faa
chore(bridge-mqtt): fix styles
2021-01-28 16:24:42 +08:00
d98d26942c
fix(bridge-mqtt): add max_inflight_size option back
...
For compatibility with versions below 4.2, we still
use the `max_inflight_size` option, but generate it
as the `max_inflight`
Previous PR: https://github.com/emqx/emqx/pull/3938
2021-01-28 16:24:42 +08:00
937390fe0f
Merge pull request #4072 from emqx/dev/v4.3.0
...
Auto-pull-request-on-2021-01-25
2021-01-25 22:05:03 +01:00
67e56658a7
fix(bridge-mqtt): fix bad time unit
2021-01-25 15:35:04 +08:00
3de8fea435
fix(bridge-mqtt): fix bad received metrics counting
2021-01-25 15:35:04 +08:00
455f210b4c
feat(cuttlefish): use hocon as a parsing function ( #4008 )
...
* chore(conf): add quotation for hocon
* chore(conf): fix paths incompatible with hocon
* chore(conf): use hocon as parsing function
* chore(docker): add quotation to some env variables for hocon
2021-01-19 19:52:17 +09:00
56920b6ca6
fix(bridge_mqtt): max_inflight_size -> max_inflight; this enables emqtt.erl to use the value ( #3938 )
...
* fix(bridge_mqtt): max_inflight_size -> max_inflight; this enables emqtt.erl to use the value
* chore(bridge_mqtt): fix elvis
* fix(worker): max_inflight_batches -> max_inflight
2020-12-28 13:43:13 +08:00
d60212787b
chore(build): remove emqx from app's applications list
2020-12-12 23:02:26 +01:00
10dbb5bc96
Fix testcases warns ( #3906 )
2020-12-11 18:54:48 +08:00
7bdd093ef5
Merge remote-tracking branch 'origin/dev/v4.3.0' into umbrella-fix-build
2020-12-11 08:55:57 +01:00
3a91ff8a7b
chore(proj): resync apps
2020-12-11 08:19:26 +01:00
Zaiming Shi