Commit Graph

4476 Commits

Author SHA1 Message Date
Feng Lee 8e11845f87 Remove ignore_loop_deliver option 2018-08-28 07:36:22 +08:00
Shawn 8925209f91
Merge pull request #1751 from terry-xiaoyu/emqx30_ut
bug fixes during UT
2018-08-28 00:31:15 +08:00
terry-xiaoyu c92eba4a5e bug fixes during UT 2018-08-28 00:27:45 +08:00
Gilbert 88d867b256
Merge pull request #1750 from Gilbert-Wong/emqx30
update emqx_broker_suite to adapt emqx 3.0 broker
2018-08-27 21:56:00 +08:00
Feng Lee 475319b907 Merge emqx30-feng branch 2018-08-27 21:36:43 +08:00
Feng Lee 1607e576de Update connection, session, stats modules 2018-08-27 21:34:11 +08:00
Gilbert Wong ce3f2e4d9e fix emqx_broker test suite 2018-08-27 21:18:00 +08:00
Shawn 958508f7af
Merge pull request #1749 from terry-xiaoyu/udate_gen_rpc
Update gen_rpc
2018-08-27 20:20:36 +08:00
terry-xiaoyu c0fb5f3186 update gen_rpc 2018-08-27 19:28:54 +08:00
Gilbert Wong 015901050f change return tuple of close_session 2018-08-27 18:19:28 +08:00
Gilbert Wong 224aaaf8a7 unsubscribe function should have two params 2018-08-27 17:11:54 +08:00
Gilbert Wong c5da439313 wrong unsubscribe call 2018-08-27 16:41:58 +08:00
Feng Lee d167a5c99a
Merge pull request #1748 from emqtt/emqx30-feng
Improve the emqx_listeners module
2018-08-27 16:24:59 +08:00
Feng Lee a19daee353 Improve the print of listener startup 2018-08-27 16:19:58 +08:00
turtled 35d821a62e Add WS stats 2018-08-27 16:15:23 +08:00
Feng Lee e5b2e584e9 Remove 'TODO:' 2018-08-27 15:57:36 +08:00
Feng Lee 42288ac412 The ACL file should not be undefined 2018-08-27 15:57:13 +08:00
Feng Lee dca292f538 Replace 'Client' with 'Credentials' map 2018-08-27 15:54:41 +08:00
Gilbert a183693ac8
Merge pull request #1747 from Gilbert-Wong/emqx30
fix subscribe bugs and update emqx_mock_client
2018-08-27 15:36:13 +08:00
Gilbert Wong 087bfe80c8 fix unsubscribe emqx_mock_client error 2018-08-27 15:24:40 +08:00
turtled 2e4fb3f946 emqttd -> emqx 2018-08-27 13:58:08 +08:00
turtled 91eb79967c Add syslog 2018-08-27 13:50:38 +08:00
Gilbert Wong 28e22825ba fix emqx subscriptions error 2018-08-27 12:35:36 +08:00
Gilbert Wong f0f1456168 fix duplicated subscribers with same topic 2018-08-27 11:21:16 +08:00
Feng Lee 6d2b31911a
Merge pull request #1746 from emqtt/emqx30-feng
Use map to replace #state{} record
2018-08-27 10:35:43 +08:00
turtled 6478f811bf Fix conflicts 2018-08-27 10:29:22 +08:00
Feng Lee 6e8635394e Use map to replace #state{} record 2018-08-27 10:25:15 +08:00
turtled 95d36d0204 Fix share sub bug 2018-08-27 10:15:41 +08:00
turtled 1448515e64 Fix websocket bug 2018-08-27 10:14:58 +08:00
Feng Lee 3ba8c90864
Merge pull request #1744 from terry-xiaoyu/emqx_30_acl_cache_v2
ACL Cache v2 for EMQ X R30
2018-08-27 09:43:08 +08:00
Feng Lee 5f65335835
Merge branch 'emqx30' into emqx_30_acl_cache_v2 2018-08-27 09:42:42 +08:00
Feng Lee 3f811aa9ca Add credentials/1 function 2018-08-27 09:28:49 +08:00
HuangDan e3fb147594 Fixed test case compilation error 2018-08-26 22:25:54 +08:00
Gilbert Wong a369fb6960 fix subscribe bug 2018-08-26 22:02:39 +08:00
terry-xiaoyu 9d29dd0e10 use config enable_acl_cache 2018-08-26 18:25:17 +08:00
Feng Lee 397179bbda Merge branch 'emqx30' of github.com:emqtt/emqttd into emqx30 2018-08-26 16:25:02 +08:00
Feng Lee 0e3728c940 Add emqx_types module and 'credentials' type 2018-08-26 16:24:51 +08:00
terry-xiaoyu 9717f9b83e add module emqx_acl_cache 2018-08-26 15:46:22 +08:00
terry-xiaoyu 8cd20744be improve cache datastruct using keys-queue 2018-08-26 13:33:00 +08:00
terry-xiaoyu a904031979 acl cache using proc_dict 2018-08-26 13:30:18 +08:00
terry-xiaoyu 737fe19331 update acl test cases 2018-08-26 12:48:32 +08:00
Gilbert Wong ee11627828 delete duplicated subscribe function 2018-08-25 18:36:17 +08:00
周子博 6b45834de4 Add emqx_cm, emqx_metrics, emqx_stats test suites 2018-08-25 18:13:49 +08:00
Feng Lee 4e674cf132
Merge pull request #1742 from emqtt/emqx30-dev
fix list_to_subid error
2018-08-25 17:34:00 +08:00
Gilbert Wong 8b4be236e5 fix list_to_subid error 2018-08-25 17:10:51 +08:00
Feng Lee 03d2d24949 Merge branch 'emqx30-dev' into emqx30 2018-08-25 16:20:09 +08:00
Feng Lee 51ea864526 Merge branch 'emqx30-dev' of github.com:emqtt/emqttd into emqx30-dev 2018-08-25 16:19:14 +08:00
Feng Lee 36129073e8 Merge branch 'emqx30-dev' of github.com:emqtt/emqttd into emqx30-dev 2018-08-25 16:08:27 +08:00
Feng Lee b7c2821326 Make reason codes of SUBACK be compatible with MQTT V3.1.1 2018-08-25 16:07:57 +08:00
Feng Lee c2c1320083 Update compat/2 for suback reason codes 2018-08-25 16:05:58 +08:00