Commit Graph

3723 Commits

Author SHA1 Message Date
turtleDeng 4d14d51dcb
Merge pull request #2691 from emqx/master
Fix the websocket normal exit bug
2019-07-16 01:42:26 +08:00
turtleDeng def758152d
Merge pull request #2690 from emqx/develop
Fix websoskct close BUG
2019-07-16 01:41:40 +08:00
GilbertWong eb7ae13ae9 Better exit reason in websocket channel 2019-07-16 01:33:15 +08:00
GilbertWong 1fc0f61fbb Fix the websocket normal exit bug 2019-07-16 01:09:42 +08:00
turtleDeng 1c17d514aa
Merge pull request #2687 from emqx/master
Auto-pull-request-by-2019-07-12
2019-07-11 18:08:31 +08:00
zhanghongtong b8ce42fd29 Merge remote-tracking branch 'origin/develop' 2019-07-11 17:46:35 +08:00
GilbertWong c23be3e15d Update ekka tag 2019-07-11 15:41:36 +08:00
terry-xiaoyu 7472e531b1 Remove log handler for alarms 2019-07-11 13:27:03 +08:00
terry-xiaoyu 1bf68f4807 Change clear alarms to info log 2019-07-11 11:15:23 +08:00
zhanghongtong 47d628f9d9 Merge remote-tracking branch 'origin/develop' 2019-07-11 10:17:13 +08:00
GilbertWong bf89646d93 Fix typo 2019-07-11 09:43:52 +08:00
GilbertWong 234037aee1 Fix will message mechanism for websocket channel 2019-07-11 09:43:52 +08:00
GilbertWong c13e194838 Fix the check_subacl bug when enable_acl is set to false 2019-07-11 09:25:20 +08:00
GilbertWong 41dcb4acf2 Delete slave.config 2019-07-11 09:20:38 +08:00
terry-xiaoyu 5867b2e763 Fix idle_timeout crash 2019-07-11 09:17:23 +08:00
turtleDeng c9498d7986
Merge pull request #2673 from emqx/master
Auto-pull-request-by-2019-07-06
2019-07-06 14:47:01 +08:00
zhanghongtong 19fdf3b77a Merge remote-tracking branch 'origin/develop' 2019-07-06 11:29:48 +08:00
terry-xiaoyu 6ab9527603 Optimize to_map for performance 2019-07-05 23:14:27 +08:00
Gilbert 70be888f3b Compat windows (#2665) 2019-07-05 23:10:13 +08:00
周子博 61d64cbb83 Fix the issue that emqx_session:attrs/1 returns wrong value 2019-07-05 22:54:57 +08:00
turtleDeng 1a2592b13c
Merge pull request #2662 from emqx/master
Auto-pull-request-by-2019-06-30
2019-06-29 18:53:42 +08:00
zhanghongtong 86feae6adc Merge remote-tracking branch 'origin/develop' 2019-06-29 18:38:45 +08:00
周子博 8234b616e5 Fix test case 2019-06-29 12:38:57 +08:00
周子博 3ad5700442 Support getting the history of alarms 2019-06-29 12:38:57 +08:00
terry-xiaoyu 96fff39535 Change default logger level to warning 2019-06-28 21:34:21 +08:00
terry-xiaoyu 0e2e4e73ca Clean staled sesssions 2019-06-26 20:04:32 +08:00
Gilbert 9df6345a6c Remove bridge functions from emqx (#2652)
* Remove bridge functions from emqx
2019-06-26 19:33:17 +08:00
tradingtrace 0b116bc208 Fix the massages order when batch dispatching 2019-06-26 19:32:15 +08:00
zhanghongtong 5835c06745 Merge remote-tracking branch 'origin/develop' 2019-06-26 04:22:32 +08:00
GilbertWong 22f7280d8e Make sure the default make behaviour is `make distclean` 2019-06-25 15:27:05 +08:00
zhanghongtong 7c3e5d765c Merge remote-tracking branch 'origin/develop' 2019-06-25 04:17:20 +08:00
GilbertWong 13d33985be Fix enoent error in run_setup rule of the makefile
Prior to this change, if user's computer has no `~/.config/rebar3`
path, `make run` would fail and report enoent error.

This change fix the problem I described above.
2019-06-24 11:42:24 +08:00
turtleDeng 872c0af3fd
Merge pull request #2649 from emqx/master
Auto-pull-request-by-2019-06-22
2019-06-22 09:51:46 +08:00
zhanghongtong 411f8a0ec7 Merge remote-tracking branch 'origin/develop' 2019-06-22 09:24:41 +08:00
Gilbert 475cabde4d Fix issue#2619 (#2646)
* Fix issue#2619
Prior to this change, websocket connection would not be disconnected
when dataframe type is other frametype. However, in mqtt spec, it
shoud be disconnected.

This change fix this inconsistent behaviour with mqtt 5.0
2019-06-21 21:21:49 +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
turtled 481458d8ec Add plugin type 2019-06-21 19:52:53 +08:00
tigercl 0c7c4ee417 Using fixed topic for system message of alarm (#2647)
* Using fixed topic for system message of alarm
2019-06-21 19:51:58 +08:00
tigercl 37eef7b72a Add 'auth.mqtt.anonymous' metric (#2631)
* Add 'auth.mqtt.anonymous' metric
2019-06-21 19:21:26 +08:00
zhanghongtong e76451000c Merge remote-tracking branch 'origin/develop' 2019-06-20 17:30:36 +08:00
Gilbert 138d7727fa
Compact windows platform which has no cpu_sup util function. (#2629)
* Compact windows platform which has no cpu_sup util function.

* Fix wrong os type clause

* Do not start timer when platform is windows
2019-06-20 11:45:44 +08:00
Gilbert 1d23d7de86
Optimize test workflow (#2642)
* Optimize test suites workflow

* Better format of makefile

* Fix protocol suite

* Add emqx_access_SUITE
2019-06-20 11:44:44 +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
zhanghongtong 65ae10a651 Merge remote-tracking branch 'origin/develop' 2019-06-20 10:49:01 +08:00
GilbertWong ffbb598a73 Increase time precision for emqx_mod_presence 2019-06-20 09:50:05 +08:00
zhanghongtong b9715b9e71 Merge remote-tracking branch 'origin/develop' 2019-06-19 04:16:00 +08:00
terry-xiaoyu ebeb2c5545 Compile emqx_logger first 2019-06-18 14:37:32 +08:00
terry-xiaoyu 09dd65b9fa Add logger header validation 2019-06-18 14:37:32 +08:00
terry-xiaoyu 7092748266 Improve log messages using logger header 2019-06-18 14:37:32 +08:00
terry-xiaoyu c64751a53c Support module level logger header 2019-06-18 14:37:32 +08:00