Commit Graph

754 Commits

Author SHA1 Message Date
turtled 91a8dbda56 Fix conflicts 2019-08-09 16:41:11 +08:00
GilbertWong 9268d23b92 Use ekka 0.6.0 2019-08-09 16:34:42 +08:00
Gilbert 96b341fde5
Add proper tests for base62 (#2761)
* Add proper tests for base62

* Delete useless comment
2019-08-07 09:24:03 +08:00
GilbertWong 3230c25b56 Delete replayq from emqx 2019-08-06 10:38:58 +08:00
Feng Lee 19a9e30768
Merge branch 'develop' into introduce-proper-testing-framework 2019-08-06 10:14:21 +08:00
GilbertWong 4e0aeee93d Import emqtt library into emqx for test cases 2019-08-06 09:43:10 +08:00
Feng Lee f60f127681 Improve the moudules and fix the bugs found in new test cases
- Fix the bug that emqx_mountpoint:unmount/2 will throw exception
- Add emqx_banned:info/1 for test cases
- Rename macro TRIE in emqx_trie module to TRIE_TAB
- Rename macro TRIE_NODE in emqx_trie module to TRIE_NODE_TAB
- Rename macro ROUTE in emqx_router module to ROUTE_TAB
2019-08-06 09:05:55 +08:00
terry-xiaoyu c5ff902974 Update gen_rpc to 2.4.1 2019-07-26 14:46:24 +08:00
GilbertWong 07d815b3f7 Update gen_rpc tag to 2.4.0 2019-07-23 14:45:24 +08:00
turtled 49afbdabda Update ekka tag 2019-07-19 18:03:53 +08:00
turtled caf6dab808 Support K8S hostname auto discovery cluster 2019-07-19 18:03:53 +08:00
GilbertWong c23be3e15d Update ekka tag 2019-07-11 15:41:36 +08:00
Gilbert 20188f9189 Optimize develop workflow and support make run and code hot swapping (#2644)
* Optimize develop workflow and support make run and code hot swapping
2019-06-21 20:52:27 +08:00
GilbertWong bcae452e42 Fix the flapping bug
Prior to this change, the banned until value will not be set
correctly because of wrong spell of config entry name .

This change fix this bug
2019-06-20 10:59:42 +08:00
terry-xiaoyu ebeb2c5545 Compile emqx_logger first 2019-06-18 14:37:32 +08:00
Gilbert Wong e7cd32edb7 Update esockd deps and fix compile warning 2019-05-31 15:21:59 +08:00
terry-xiaoyu e29cde60a9 Update ekka to v0.5.5 2019-05-30 18:58:37 +08:00
spring2maz ac0e637a4b Delete APPLICATION macro from erl-opts in rebar.config 2019-05-24 10:16:10 +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
Gilbert Wong 3b0f232961 Workaround for dep-vsn-check in travis-ci 2019-04-25 16:25:28 +08:00
Gilbert Wong b3927ff730 Add emqx_ct_helpers as deps and refactor test suites 2019-04-25 13:41:22 +08:00
terry-xiaoyu 8be2defb6b Update ekka to v0.5.4 2019-03-30 10:41:48 +08:00
Gilbert 2534b8dc64 Support to pass ws compressing options (#2356)
Add new config entries about websocket
2019-03-27 10:19:35 +08:00
turtleDeng b902ff3656 Update gen_rpc to v2.3.1 (#2315)
Update gen_rpc to v2.3.1
2019-03-15 10:30:14 +08:00
spring2maz 48450d1d37 Move request response out of emqx client (#2293)
* Delete response_topic_prefix

The Response-Infomation in CONNACK was misinterpreated, it should
not be a broker's global config, instead, it should be per-client
or even per-session prefix/suffix mechanism

* Delete request-response code from emqx_client

* Add request-response test code

* meck as default dependency --- temp workaround for dep-vsn-check
2019-03-13 11:27:25 +08:00
Gilbert 93162c52b6
Fix conf parse bug (#2296)
Prior to this change, there are some config entry which is not parsed
correctly. So if user modify config such as reconnect_interval for
bridge, the new config can not be taken into effect.
2019-03-11 16:31:21 +08:00
spring2maz fbe67e6784 Introduce new bridge impl 2019-02-28 11:17:27 +08:00
turtleDeng 00863acea3
Merge emqx30 (#2181)
* Change the reason code in will topic acl check (#2168)

* Fix bridge bug (#2160)

* Limit bridge QoS less than 1

* Improve shared sub dispatch implementation. (#2144)

* Upgrade ekka, esockd libraries

* Improve the 'try_open_session' function

* Reload config (#2180)
2019-01-25 13:01:48 +08:00
Gilbert 9f83544fce
Fix failed testcase (#2127)
* Fix failed test case
Prior to this change, terry-xiaoyu enhanced the cuttlefish to
support emqx enterprise edtion configuration entries. But it cause 6
test case failed.

* Fix dep-vsn-check
2019-01-06 19:53:01 +08:00
turtleDeng 6a1ebe299a
Merge emqx32 to emqx30 (#2112) 2018-12-28 19:44:41 +08:00
turtled 390fae1134 Rm clique dep 2018-12-21 17:09:15 +08:00
terry-xiaoyu 14abbf96db Update cuttlefish tag 2018-12-14 09:53:13 +08:00
Shawn 93a079752f Update cuttlefish to v2.1.1 (#1978) 2018-11-23 11:04:55 +08:00
tigercl 551d5d99d2 Change 'aquire' to 'acquire' (#1976)
* Change 'aquire' to 'acquire'
2018-11-23 11:00:30 +08:00
turtled faeda253e1 Fix conflicts 2018-11-10 11:44:55 +08:00
terry-xiaoyu f6266eaa93 Bumped the version number of deps 2018-11-02 19:42:51 +08:00
terry-xiaoyu 94dbdffd59 New logger formatter with meta-data 2018-11-02 18:38:07 +08:00
spring2maz 28c8f2dd5c Remove neotoma plugin, build cuttlefish script in sub-dir 2018-10-27 14:21:53 +02:00
HuangDan e5f977d808 Upgrade the esockd library 2018-09-29 22:16:54 +08:00
spring2maz 9b2629e884 Fix dependency version discrepancy between Makefile and rebar.config 2018-09-25 22:09:13 +08:00
spring2maz 35d209f364 Fix travis build 2018-09-14 00:52:03 +08:00
spring2maz 0c39a7620e Rebar3 and erlang.mk dual support. (#1806)
* Rebar3 and erlang.mk dual support.

There was only erlang.mk support prior to this change.
The main reasons for this dual support are:
* Cover report upload can only be done by rebar3 in travis.ci
* We want to prepare for the future to build emqx releases using rebar3
* We do not want to stop supporting erlang.mk in one single step

* Add depencency version consistency check between erlang.mk and rebar.config
2018-09-09 21:51:42 +08:00
Feng Lee 16eef90707 Remove rebar.config 2017-09-13 07:43:02 +08:00
Feng Lee 88f7e71f29 Update rebar.config 2017-08-23 11:08:03 +08:00
Feng Lee 437b26718b Call ekka_autocluster:bootstrap/0 to build the cluster 2017-07-18 18:40:03 +08:00
Feng Lee 9b646d8cbc Integrage with 'ekka' library 2017-06-16 12:30:09 +08:00
turtled 8d6457996c support bcrypt 2017-04-11 16:02:48 +08:00
Feng Lee 783079cb07 Merge emq20 branch 2017-03-24 13:35:43 +08:00
Feng Lee b54fba2a5d Depend on emqtt/pbkdf2 to resovle the building errors of Travis CI 2017-03-24 12:35:39 +08:00
Feng Lee 181ac36171 Remove the 'erlang-pbkdf2' dep to resolve CI building error 2017-03-24 11:26:42 +08:00
Feng Lee 852c671881 Add goldrush dep 2017-03-24 10:46:52 +08:00
Feng Lee a0c60f11cf Depends on 'emq22' branch 2017-03-22 10:49:09 +08:00
Feng Lee 076b3c0068 Upgrade esockd library to v4.2 2017-03-13 17:10:54 +08:00
Feng Lee 056dc747ad Depend on emq20 branch of esockd library 2017-03-13 14:56:59 +08:00
Feng Lee 05396f0ade Add pbkdf2 dependencies and fix the building errors 2017-03-13 13:30:49 +08:00
Feng Lee d310fff532 Add 'lager_syslog' dependency 2017-02-21 18:46:44 +08:00
Feng Lee a5ba86fd1a Update rebar.config 2017-02-16 11:46:21 +08:00
Drew Varner 8e60b8f00a Remove gen_logger references 2017-01-23 20:02:02 -05:00
Feng Lee ed730f6827 Fix issue#814 - Cannot remove a 'DOWN' node from the cluster 2016-12-12 19:25:49 +08:00
Feng eb9c11f321 remove modules 2016-10-31 20:26:56 +08:00
Feng 3406137433 new config 2016-10-08 18:38:33 +08:00
Feng 52403ceb67 update Makefile 2016-10-02 15:02:49 +08:00
Feng a16802d018 session.subscribed, session.unsubscribed hooks and retainer module 2016-09-08 09:10:45 +08:00
Feng 3e77773d04 generated by erlang.mk 2016-07-19 17:58:31 +08:00
Feng 2e200f253f 2.0 - erlang.mk to replace rebar 2016-07-19 17:46:05 +08:00
Feng Lee c73d299942 gen_logger 2016-05-02 01:05:55 +08:00
Feng Lee f96f209b4a esockd .* 2016-05-02 00:55:59 +08:00
Feng c94f6f30dd ct - emqttd.test.config 2016-03-11 23:48:56 +08:00
Feng 928780f322 common tests 2016-02-16 02:20:29 +08:00
Feng e8c0546525 comment enunit verbose 2016-02-15 11:45:30 +08:00
Feng 775dc10367 compile behaviour module first 2016-01-31 15:30:26 +08:00
Feng 490d7ce175 fix issue #348 -Compilation fails if repo is cloned with a different name 2015-11-04 23:35:50 +08:00
Feng 5aa30f0b1c master 2015-11-04 22:23:20 +08:00
Feng e538d91efc esockd3 2015-11-01 12:47:24 +08:00
Feng f4cf90ae91 refactor client 2015-10-30 16:00:11 +08:00
Feng d22d556d56 lager 2015-09-26 14:09:47 +08:00
Feng 4b53f84d17 submods, erl_opts 2015-09-26 13:10:25 +08:00
Feng 207c50bf14 lib_dirs 2015-08-07 16:34:28 +08:00
Feng 7009ef944b gproc 0.5 2015-06-26 11:06:20 +08:00
Feng Lee af025d5625 fix project structure 2015-06-22 16:45:10 +08:00
Feng Lee 5e8ac6b3ea conver_enabled 2015-05-04 21:49:58 +08:00
Feng Lee 4d89ec1ed5 fix issue #102 - 'make clean' cannot work 2015-04-30 16:36:08 +08:00
Feng Lee 2db943f5e8 Merge branch 'master' into dev 2015-04-29 13:46:38 +08:00
Feng Lee faae6e5a0a fork mochiweb from simpp 2015-04-29 13:44:41 +08:00
Feng Lee ada53f8b68 merge master 2015-04-25 23:26:56 +08:00
Feng Lee fcecd1e0db gproc 0.4 2015-04-23 23:14:15 +08:00
Feng Lee b4a582e0f5 rm demo acl, auth modules 2015-04-22 15:05:02 +08:00
Ery Lee a44e955d64 groc 0.3.* 2015-04-20 03:26:44 +08:00
Feng Lee fd8024821b gproc pool 2015-04-19 12:49:13 +08:00
Feng Lee 23d774ce1a apps/emqtt 2015-04-15 01:12:45 +08:00
Ery Lee 1752fc6c89 esockd 2.* 2015-03-15 20:26:49 +08:00
Ery Lee aca536cd8a rename project name from 'emqtt' to 'emqttd' 2015-03-10 20:09:13 +08:00
Ery Lee e2c1eda808 client -> clients 2015-03-09 14:05:02 +08:00
Ery Lee 682f005660 0.3.1 2015-03-02 14:23:20 +08:00
Ery Lee 2d2aa2f79a upgrade esockd, mochiweb 2015-03-02 01:40:22 +08:00
Ery Lee fdc69f6ea6 fix deps 2015-01-06 10:47:06 +08:00
Feng Lee 3a6ed9a876 0.2 project structure 2014-12-06 19:12:29 +08:00
erylee 9bdbb84ed2 refactor header file 2013-06-28 11:01:23 +08:00
erylee 60b42661b1 add plugins folder 2012-12-27 16:43:26 +08:00
erylee 50baba2cf6 rebar release 2012-12-26 14:35:52 +08:00
erylee 45647b5ca7 rebar release 2012-12-26 12:56:00 +08:00
erylee efc1d9f424 add bin/ and some files 2012-12-21 17:33:21 +08:00
erylee a77bbf33e2 first workable 2012-12-20 16:30:51 +08:00