yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,608 Commits 393 Branches 684 Tags 74 MiB
Commit Graph

6608 Commits

Author SHA1 Message Date
Zaiming Shi 64cfaf4385 improve(print): io:format error message without indentation 
Avoid squeezing lines to the right.
 2021-02-19 07:45:37 +01:00
Zaiming Shi 692d08b630
Merge pull request #4205 from z8674558/dev/v4.3.0 
merge dev/v4.3.0 to dev/v5.0
 2021-02-19 07:28:31 +01:00
z8674558 469c7ad43a chore(config): rm redundant quotes because they are now processed in cuttlefish 2021-02-19 13:15:11 +09:00
z8674558 f251609ace Merge remote-tracking branch 'upstream/dev/v5.0' into dev/v4.3.0 2021-02-19 12:47:07 +09:00
Benjamin Große 28f9b4d519 feat(peer_cert_as_clientid): peer_cert_as_clientid = cn | dn | crt | pem | md5 
pem is base64 encoded instead of binary crt

peer_cert_as_username=crt breaks exhook proto utf8 parsing of username

crt cannot be used in a topic name due to being invalid utf8
pem cannot be used in a topic name due to having slashes

peer_cert_as_clientid = md5 allows to e.g. subscribe to "t/%c" with ACL

existing peer_cert_as_username combinations are unaffected.
 2021-02-19 10:53:11 +08:00
Zaiming Shi dfcc2dd566
Merge pull request #4195 from z8674558/env-override 
feat(bin): let cuttlefish read env var
 2021-02-18 22:54:00 +01:00
z8674558 2b9a702b70 test(ci): give parameters thru env variable, not sed 2021-02-19 01:09:20 +09:00
z8674558 74b7ea34d9 feat(bin): let cuttlefish read env var 2021-02-19 01:09:06 +09:00
Zaiming Shi d2bd9b4078
Merge pull request #4197 from zmstone/improve-shared-sup-random-start-point-for-roundrobin 
improve(shared-sub): Randomise the startpoint for round-robin
 2021-02-18 13:26:01 +01:00
JianBo He 54d82584bc
Merge pull request #4196 from emqx/dev/v4.3.0 
Auto-pull-request-on-2021-02-16
 2021-02-18 11:03:08 +08:00
Zaiming Shi db461179c5 improve(shared-sub): Randomise the startpoint for round-robin 2021-02-17 19:10:37 +01:00
Shawn eec64e440d
fix(tracer): create short handler-id if clientid is too long (#4164) 
* fix(tracer): create short handler-id if clientid is too long

No need to support lists and atoms for when tracing clients/topics.
 2021-02-16 14:45:33 +08:00
Zaiming Shi 65f3a2b685 fix(cli): Stop http listener without port number 2021-02-15 10:42:17 +01:00
Zaiming Shi a93d62ace6 refactor(cli): Print listener ID as table head 2021-02-15 10:34:47 +01:00
Zaiming Shi 2fc758c49a fix(test): Pin emqx-ct-helper 1.3.6 2021-02-14 23:17:03 +01:00
Zaiming Shi f9465dda16 Merge branch 'dev/v4.3.0' into merge-e4.2.4-to-dev-4.3.0 2021-02-14 21:41:23 +01:00
Zaiming Shi 877f1750a4
Merge pull request #4191 from emqx/dev/v4.3.0 
Auto-pull-request-on-2021-02-14
 2021-02-14 21:34:52 +01:00
Zaiming Shi c5a02c729a feat(listeners): Add an api to ensure all listeners are started 2021-02-14 21:30:50 +01:00
Zaiming Shi dfa9bbc0c2 refactor(listeners): use emqx_ctl to print cli messages 
It's better to keep cli print behaviour consistent.

It also makes tests easier as they can meck emqx_ctl:print to
validate the output.
 2021-02-14 20:40:01 +01:00
Zaiming Shi 2d79c870c1 fix(mgmt_cli): Do not doulbe print listener stop results 2021-02-14 20:16:42 +01:00
Zaiming Shi 153977609e feat(listeners): Add identifier to listeners 
Listeners are internally identifiered by the listen-on tuple
which is not UI friendly when we have to find a listener by this
'signature'.

The listeners are actually named in configs, but the names are
discarded in the parsing functions.

This commit is to keep the name and provide an API to find
listener by name (identifier).
 2021-02-14 18:12:40 +01:00
JianBo He 56a75d0d47 fix(mgmt): make the format function clearer 
Co-authored-by: Zaiming Shi <zmstone@gmail.com>
 2021-02-14 18:58:13 +08:00
JianBo He fcbf2539bc refactor(mgmt): move the fomating codes to emqx_mgmt_api_clients.erl 2021-02-14 18:58:13 +08:00
JianBo He 9b3a6aa635 fix(mgmt): fix client formating crash 
see: https://github.com/emqx/emqx/issues/3868
 2021-02-14 18:58:13 +08:00
Zaiming Shi db5ec5bbb7
Merge pull request #4180 from zmstone/chore-delete-unused-vars 
chore(ci): delete usage of EMQX_DEPS_DEFAULT_VSN
 2021-02-14 07:51:10 +01:00
Zaiming Shi d4a43aa85c
Merge pull request #4189 from emqx/dev/v4.3.0 
Auto-pull-request-on-2021-02-13
 2021-02-13 21:36:01 +01:00
Zaiming Shi 8077cf60d5
Merge pull request #4185 from HJianBo/upgrade_cowboy 
chore(deps): upgrade cowboy to 2.8.2
 2021-02-13 18:05:47 +01:00
Zaiming Shi 9c5c99c94f
Merge pull request #4186 from zmstone/chore-sytle-fix-elvis 
Chore sytle fix elvis
 2021-02-13 14:19:53 +01:00
Zaiming Shi dc184574a3 chore(style): fix elvis check for emqx_access_rule 2021-02-13 11:54:09 +01:00
Zaiming Shi 406a7d60c7 chore(style): fix elvis check for emqx_connection 2021-02-13 11:50:17 +01:00
Zaiming Shi b4b318cb86 chore(style): fix elvis check for emqx_connection_SUITE 2021-02-13 11:41:18 +01:00
JianBo He e3d19b03c5 chore(deps): upgrade cowboy to 2.8.2 2021-02-13 18:29:39 +08:00
Zaiming Shi 9b82112b7c Merge remote-tracking branch 'origin/dev/e4.3.0' into merge-e4.2.4-to-dev-4.3.0 2021-02-13 11:10:08 +01:00
Zaiming Shi 4463ccf76c
Merge pull request #4178 from zmstone/resolve-conflict-v4.3.0-to-v5.0 
Resolve conflict v4.3.0 to v5.0
 2021-02-13 09:23:01 +01:00
Zaiming Shi f5f79af418 fix(boot): allow quoted node name and cookie 2021-02-12 14:55:27 +01:00
Zaiming Shi 99c9374a9c chore(ci): delete usage of EMQX_DEPS_DEFAULT_VSN 
EMQX_DEPS_DEFAULT_VSN is the old package version number
used in emqx-rel project.
We no longer use it in emqx.git umbrella project
 2021-02-12 14:50:01 +01:00
Zaiming Shi 3863b7f116 fix(config): Quote config string values 2021-02-12 11:16:45 +01:00
Zaiming Shi 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
Zaiming Shi 12568c8c74
Merge pull request #4173 from zmstone/refactor-relocate-management-and-dashboard 
refactor(proj): Move opensource apps to lib-opensource
 2021-02-12 10:20:47 +01:00
Zaiming Shi 23b66c0fd5 chore(rebar.config.erl): wildcard only one level for include dir 2021-02-11 17:22:20 +01:00
Zaiming Shi e7785a63ee fix(scripts): update scripts to work with new lib-opensource dir 2021-02-11 17:22:20 +01:00
Zaiming Shi 8f477e8411 refactor(proj): Move opensource apps to lib-opensource 
One step closer for better code abstraction for opensorce vs enterprise
So far this relocation is to make opensource to enterprise merges
conflict free.
 2021-02-11 16:45:05 +01:00
Zaiming Shi 6f736a79b7 chore(script): Allow compare base to be a commit sha1 hash 2021-02-11 16:44:12 +01:00
Zaiming Shi 507759b9f1 Revert "refactor(emqx_modules): Move modules config to app dir" 
This reverts commit 9cae8784c0.
Because the reverted change broke compatibility with 4.2.x
configuration.
 2021-02-11 16:44:12 +01:00
JianBo He 7bf0097330
Merge pull request #4140 from HJianBo/unify_pgsql_conf 
Refine the auth-pgsql SSL version configuration
 2021-02-11 15:51:09 +08:00
JianBo He 2b4906b47d
Merge branch 'dev/v4.3.0' into unify_pgsql_conf 2021-02-11 15:50:43 +08:00
Zaiming Shi 514c2c0af5
Merge pull request #4169 from zmstone/refactor-move-modules-config-to-emqx-modules-app 
refactor(emqx_modules): Move modules config to app dir
 2021-02-10 09:03:04 +01:00
Zaiming Shi e80959ea2f
Merge pull request #4165 from zmstone/chore-merge-enterprise-configs 
chore(conf): merge enterprise configs
 2021-02-10 08:27:56 +01:00
Zaiming Shi 8bf763b72b
Merge pull request #4167 from zmstone/fix-tls-ensure-tls-config-integrity 
fix(tls): Ensure tls config integrity
 2021-02-10 08:26:46 +01:00
Zaiming Shi d74bb81ff1 chore(style): make elvis happy 2021-02-10 00:02:52 +01:00