1e615b8826
Fix conflicts
2019-04-26 00:23:58 +08:00
281fb2d5ec
Depend emqx_ct_helper with tag
2019-04-25 14:30:35 +08:00
b3927ff730
Add emqx_ct_helpers as deps and refactor test suites
2019-04-25 13:41:22 +08:00
291216ee43
Fix conflicts
2019-04-19 18:57:45 +08:00
bcbb4b68e9
Add flapping detect feature
2019-04-19 16:34:33 +08:00
fe4bf61283
Force emqx compile win30 branch of emqx_passwd
2019-03-31 12:20:32 +08:00
27d73f257d
Specify win30 branch for cuttlefish
2019-03-30 11:33:46 +08:00
c2d561a725
Detete emqx_protocol:rc to fix ci
2019-03-30 11:02:42 +08:00
67d7ade1f5
Update cuttlefish version
2019-03-30 10:45:18 +08:00
8be2defb6b
Update ekka to v0.5.4
2019-03-30 10:41:48 +08:00
1392732be4
Merge remote-tracking branch 'origin/develop' into win30
2019-03-30 10:29:50 +08:00
2534b8dc64
Support to pass ws compressing options ( #2356 )
...
Add new config entries about websocket
2019-03-27 10:19:35 +08:00
3a8f96730a
Fix conflicts
2019-03-18 09:38:57 +08:00
7ff56b55f0
Force makefile to git clone deps
2019-03-16 23:05:15 +08:00
88c32b2c41
Fix emqx_rpc badargs bug
2019-03-16 21:27:41 +08:00
02fe8560e2
Improve emqx_hooks and credentials ( #2309 )
...
* Improve emqx_hooks and credentials
1. Modify the return modes of emqx hooks.
Change the return value of hook functions to:
- ok: stop the hook chain and return ok
- {error, Reason}: stop the hook chain and return error
- continue: continue the hook chain
And the return value of emqx_hooks:run/2 is changed to:
- ok
- {error, Reason}
And the return value of emqx_hooks:run/3:
- {ok, Acc}
- {error, Reason, Acc}
2. Treat password as a member of credentials.
Password should be wrapped in the `credentials` data-structure, as the
username/password pair together consists of an authentication method.
There can be some methods using some other credential data (e.g.
a JWT token), and these credential data should also be wrapped in the
the `credentials` data-structure.
An event `client.authenticate` is triggered when an user logs in:
```erlang
emqx_hooks:run('client.authenticate', [], Credentials)
```
A `default callback` that deny/allow any user (according to the
`allow_anonymous` config) should be appended to the end of the
callback chain.
The `credentails` is passed through all of the callbacks, and
can be changed over in this process.
* Refactor emqx hooks return mode
* Remove password from PState
2019-03-16 10:43:53 +08:00
b902ff3656
Update gen_rpc to v2.3.1 ( #2315 )
...
Update gen_rpc to v2.3.1
2019-03-15 10:30:14 +08:00
5433d61cd9
Fix windows build problem
2019-03-06 11:35:47 +08:00
5ec35ca973
Fix conflicts
2019-03-05 11:31:46 +08:00
da755b88c7
Add monitors and alarm handler ( #2266 )
...
* Add monitors and alarm handler
2019-02-28 18:25:17 +08:00
c26d13b057
Fix test case ( #2275 )
...
* Fix t_rpc test
2019-02-28 18:07:16 +08:00
7efd7b3ec0
Rename portal to bridge
2019-02-28 15:31:54 +08:00
1626cade28
Deleted batch publish support in emqx_portal_client
...
eqmx_portal_mqtt has to do single message publish calls for now
Also fix a bug in emqx_portal_mqtt ack collector
2019-02-28 11:17:27 +08:00
efc9e34033
Make use of BUMP_PACKET_ID the only way to generate packet IDs
2019-02-28 11:17:27 +08:00
6e1d4ec261
Add emqx_portal SUITE to default CT list
2019-02-28 11:17:27 +08:00
2903a810ce
Add emqx_portal:ensure_foreard_present API
2019-02-28 11:17:27 +08:00
fbe67e6784
Introduce new bridge impl
2019-02-28 11:17:27 +08:00
565c1a8c85
Optimize unset_flag/2 and add some specs
...
- Optimize unset_flag/2
- Add some function specs
- Add emqx_message_SUITE to Makefile
2019-02-22 17:06:52 +08:00
44d3eff094
Auto-pull-request-by-2019-02-19 ( #2232 )
...
* Update Copyright to 2019 (#2191 )
* Disable bridges by default (#2189 )
* Fix warning logger args emqx#2195
* Ambiguity elimination (#2217 )
* Fix emqx_ws_connection: prevent crashes on pong (#2210 )
* Issue#2184 (#2194 )
* Delete dep-vsn-check
* Format app.src
2019-02-19 14:00:34 +08:00
cce6a649cc
Fix conflicts
2019-01-25 14:10:30 +08:00
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
3748cd434d
Add test case for emqx_sys_mon ( #2150 )
2019-01-12 23:09:39 +08:00
99f4283458
Update cuttlefish to v2.2.1
2019-01-04 22:55:58 +08:00
78b3c375d8
Improving 'emqx_ws_connection' coverage ( #2107 )
2019-01-03 12:59:39 +08:00
6a1ebe299a
Merge emqx32 to emqx30 ( #2112 )
2018-12-28 19:44:41 +08:00
157334bd5f
Update makefile
2018-12-24 10:39:14 +08:00
4e469d5bf9
Update cuttlefish tag
2018-12-23 20:55:15 +08:00
b844665d6b
Fix conflicts
2018-12-23 15:07:06 +08:00
390fae1134
Rm clique dep
2018-12-21 17:09:15 +08:00
c93d0fb174
Add test cases for emqx_gc module
2018-12-21 10:28:33 +08:00
14cffcf7fb
Add the 'emqx_pd' module
...
Add utility functions for erlang process dictionary
Add test cases for emqx_pd
2018-12-20 16:45:25 +08:00
721b72b96a
Add 'active_n' option to optimize the CPU usage of emqx_connection ( #2060 )
...
* Add 'active_n' option to optimize the CPU usage of emqx_connection
* Supports batch processing 'DOWN' events
2018-12-17 19:53:29 +08:00
d445c17e6c
Move some vm args to file vm.args
2018-12-14 09:53:13 +08:00
fc637aec0a
Force emqx-rel to use win30 branch of emqx_passwd to build
2018-12-10 17:43:22 +08:00
b4d981daf2
Add a sequence module to generate index for subscription sharding
2018-12-04 15:59:24 +08:00
520a5e0225
Download erlang.mk and use git tag in appfile vsn
2018-12-03 15:16:53 +08:00
de979b27c0
Fix build failure on windows
2018-11-30 23:00:10 +08:00
76ced677ee
Fix conflict
2018-11-30 19:51:59 +08:00
b87e72861a
Fallback to git clone -n then checkout if git version is older than 1.8
2018-11-30 11:03:26 +01:00
14dfe03426
Use git tag for app vsn
2018-11-30 11:03:26 +01:00
turtled