Commit Graph

4466 Commits

Author SHA1 Message Date
turtleDeng a3103cec7b Revert "Fix websocket bug. Prior to this change, websocket connection would be closed directly without sending connack packet when acl check fails."
This reverts commit e73c4c64d0.
2019-06-12 15:51:20 +08:00
GilbertWong e73c4c64d0 Fix websocket bug.
Prior to this change, websocket connection would be closed directly
without sending connack packet when acl check fails.

This change fix this bug.
2019-06-12 15:49:48 +08:00
turtleDeng 76525cc703
Fix acl deny action logic (#2613) 2019-06-12 15:49:18 +08:00
tigercl 3462bbd619 Fix retain in will message (#2607)
* Fix retain in will message

* Only handle retain available flag in MQTT v5
2019-06-12 15:43:52 +08:00
Feng Lee de978d4771 Update the test cases for emqx_channel, emqx_protocol
- Improve emqx_client to Use the new emqx_frame:parse/2
- Update the ct suites for emqx_channel, emqx_ws_channel
2019-06-12 10:31:44 +08:00
Feng Lee d386b27e8a Adopt channel architecture and improve the MQTT frame parser 2019-06-11 23:18:38 +08:00
zhanghongtong 5025b2f65d Merge remote-tracking branch 'origin/develop' 2019-06-06 13:47:12 +08:00
Feng Lee f801ff1e53 Optimize metrics using counters and persistent_term (#2597)
* Optimize emqx_metrics module using persistent_term and counters in OTP 22
2019-06-05 23:16:35 +08:00
turtled f46205daff Restart mnesia application 2019-06-05 11:50:09 +08:00
zhanghongtong 97f9e7123d Merge remote-tracking branch 'origin/develop' 2019-06-04 11:17:04 +08:00
Gilbert Wong f3fcd16dee Fix wrong default value in protocol module 2019-06-03 16:25:04 +08:00
zhanghongtong f0a434739d Merge remote-tracking branch 'origin/develop' 2019-06-02 04:06:51 +08:00
Gilbert Wong e7cd32edb7 Update esockd deps and fix compile warning 2019-05-31 15:21:59 +08:00
Gilbert Wong 47f9d0e90f Adjust format 2019-05-31 11:16:50 +08:00
Gilbert Wong 365832f945 Use new ranch api to elimate warning log for deprecated apis 2019-05-31 11:16:50 +08:00
Feng Lee 9715234626 Optimize the emqx_zone module using persistent_term
- Don't reload the zone options for updating persistent_term is
expensive
- Use '{?MODULE, Zone, Key}' as the key to avoid name collision
2019-05-31 08:53:42 +08:00
zhanghongtong 076776d7d4 Merge remote-tracking branch 'origin/develop' 2019-05-31 04:06:43 +08:00
terry-xiaoyu e29cde60a9 Update ekka to v0.5.5 2019-05-30 18:58:37 +08:00
zhanghongtong 44d901eb1e Merge remote-tracking branch 'origin/develop' 2019-05-29 11:03:25 +08:00
terry-xiaoyu be7de756c6 Stop alarm before emqx stops 2019-05-28 17:11:31 +08:00
turtleDeng 297a385def
Merge pull request #2573 from emqx/develop
Merge the develop branch into the master
2019-05-27 10:18:49 +08:00
Gilbert 0857b976ed Better zone (#2548) 2019-05-25 22:29:23 +08:00
HeeeJianBo 87ffa77ade Fix lookup_session_pids return data type error 2019-05-25 22:28:34 +08:00
spring2maz ac0e637a4b Delete APPLICATION macro from erl-opts in rebar.config 2019-05-24 10:16:10 +08:00
turtled 54f2a768a8 Rm start logger:set_primary_config 2019-05-23 10:51:21 +08:00
Gilbert Wong 1c83270184 Add case clause for emqx_sn and emqx_coap plugin 2019-05-21 11:19:52 +08:00
Gilbert Wong 3f53c3822d Fix ct rule in makefile 2019-05-17 10:27:14 +08:00
HeeeJianBo caa582a028 Revert the PR #2355
- Add anonymous field for credentials
2019-05-15 15:04:27 +08:00
JianBo He 1a92f3259f Enable cert_as_username to pass value to username_as_clientid (#2536) 2019-05-15 10:20:04 +08:00
JianBo He 79c1b7eb78
Put sockname to credentials (#2532)
* Add sockname to credentials

* Explicit credentials type define
2019-05-14 10:22:30 +08:00
JianBo He 97cca1a5ba Set {active, N} for ssl connection (#2531) 2019-05-13 10:18:01 +08:00
turtleDeng 311f1e6df1
Merge pull request #2521 from emqx/develop-3.2 2019-05-09 11:16:14 +08:00
zhanghongtong bd664ae370 Merge remote-tracking branch 'origin/develop' 2019-05-09 10:50:29 +08:00
Gilbert Wong 8065cafe1d Restore app.confg rule in makefile for debug and test 2019-05-08 21:18:24 +08:00
Gilbert Wong fc6f54602d Fix plugin load bug 2019-05-08 14:23:12 +08:00
tigercl 7e0ac5bd34
Fix bad config type of long_gc (#2504) 2019-05-08 10:19:49 +08:00
terry-xiaoyu 7b356e80f4 Rename varibles 2019-05-07 17:27:06 +08:00
terry-xiaoyu a1eb7ca7d2 Adapt max-heap-size to Arch-32 systems
The erlang:process_flag(max_heap_size, MaxHeapSize) can only set a MaxHeapSize of `small integer`, which is smaller than 2^59 on 64-bit systems, and 2^27 on 32-bit systems.
2019-05-07 17:27:06 +08:00
tigercl b4c659fb54 Add suboptions for stats (#2507) 2019-05-06 19:17:54 +08:00
Gilbert Wong 3ece73b912 Reuse plugin filter logic to adapt to emqx rebar3 release 2019-05-06 13:34:55 +08:00
terry-xiaoyu 0ea6697a57 Enlarge chars_limit to 8192 2019-05-05 21:28:59 +08:00
spring2maz b040d37a40 Merge remote-tracking branch 'origin/develop' into develop-3.2 2019-05-05 12:43:32 +02:00
terry-xiaoyu 0a56fc236a Enable force_shutdown_policy by default #2494
Set default max-queue-len to 10000, and default max-heap-size to 1024MB.
2019-05-05 16:41:28 +08:00
turtled ea83d2087c Optimize log configuration 2019-05-05 14:35:43 +08:00
turtled 6dd09ef681 Optimize log configuration 2019-05-05 14:35:43 +08:00
spring2maz d0131ec663 Pin emqx-ct-helpers v1.1 (#2495)
* Pin emqx-ct-helpers v1.1.1

* Fix loaded_plugins touch command
2019-05-04 04:41:08 +08:00
spring2maz 97476b8bde Build with rebar3 (#2475)
* Pin cuttlefish rebar3 branch

* No shallow clone for rebar3

* Replace timer:sleep with receive after for deterministic

* Build with only rebar3

* bbmustache as a test dependency

* Change to plain deps

* Use shallow clone by default

* Add ct-helpers as test dep
2019-04-28 09:40:39 +08:00
turtleDeng 79c2879db6
Merge pull request #2490 from emqx/develop
Merge develop to dev32
2019-04-26 15:25:30 +08:00
zhanghongtong 21c18d15d4 Merge remote-tracking branch 'origin/develop' 2019-04-26 03:55:02 +08:00
Gilbert Wong 3b0f232961 Workaround for dep-vsn-check in travis-ci 2019-04-25 16:25:28 +08:00