d18f4ba550
Fix wrong config entries
2019-02-28 11:18:12 +08:00
afa0d98b8d
Disable bridge defaultly
2019-02-28 11:17:27 +08:00
796fc3b1ba
Fix app config generation ( #2245 )
2019-02-28 11:17:27 +08:00
d7e18c95c6
Fix spelling error
2019-02-28 11:17:27 +08:00
6d51d78dfc
Add portal transport over emqx_client.
2019-02-28 11:17:27 +08:00
fbe67e6784
Introduce new bridge impl
2019-02-28 11:17:27 +08:00
a0fd9e63e0
Add data_dir to emqx.conf ( #2271 )
...
* Add data_dir to emqx.conf
2019-02-28 09:28:37 +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
69954480bf
Hook args ( #2119 )
2019-01-03 13:54:31 +08:00
6a1ebe299a
Merge emqx32 to emqx30 ( #2112 )
2018-12-28 19:44:41 +08:00
24ac3e78a2
Add +L vm args for reducing some memory ( #2110 )
2018-12-28 15:49:38 +08:00
7d3357e0f3
Merge emqx32
2018-12-21 16:01:32 +08:00
7d9e350bbe
Add option to disconnect client in case acl deny ( #2059 )
...
* Add option to disconnect client in case acl deny
2018-12-19 10:34:06 +08:00
c7fa4b1b15
Revert vm args in emqx conf b ( #2070 )
...
* Revert changes in emqx.conf for backward compatibility
2018-12-18 16:50:47 +08:00
666d9706a3
Fixed conflicts
2018-12-18 16:41:10 +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
52e2c56ce1
Change default configs for max-connections
2018-12-14 18:30:19 +08:00
3df8de2419
Rename vm.args.cloud -> vm.args
2018-12-14 18:29:52 +08:00
7c7d6b031c
Modify the NOTE descripition at the begining of the file
2018-12-14 09:53:13 +08:00
68a6a88eb9
Move all vm args into separate file vm.args
2018-12-14 09:53:13 +08:00
d445c17e6c
Move some vm args to file vm.args
2018-12-14 09:53:13 +08:00
abe9aff062
Add 'enable_session_registry' config
2018-12-13 18:28:32 +08:00
ea62b15c87
Alter apis provided by emqx_metrics, and use existing timer to commit metrics
2018-11-30 17:44:29 +08:00
194dbc02c8
Add batch commit for metrics
2018-11-30 17:44:29 +08:00
5c291ff23e
Fix the 'route_batch_delete' config
2018-11-28 16:04:04 +08:00
09025338d4
Enable emqx.log by default ( #1979 )
2018-11-23 18:10:59 +08:00
14b8036576
Use username replace id(issue#1737) ( #1961 )
...
* Use username replace id(issue#1737)
* Add test case for issue#1737
* Make with_connection/2 support batch connect
2018-11-21 22:51:33 +08:00
a2c658ba19
Add acking mechamism for shared dispatch ( #1872 )
...
* Add acking mechamism for shared dispatch
For QoS0 messages, no acking
For QoS1/2 messages, 'ACK' at any of events below:
- ACK when QoS is downgraded to 0
- Message is sent to connection process
'NACK' at any of events below:
- Message queue is full and the receiving session starts to drop old messages
- The receiving session crash
Upon 'NACK', messages are dispatched to the 'next' subscriber in the group,
depending on the shared subscription dispatch strategy.
2018-11-21 22:49:45 +08:00
16821490ce
Fix issue#1874 ( #1964 )
...
* Fix issue#1874
Prior to this change, if user use one client connect emqx with mqtt
v3.1.1, the client subscribe the topic and publish message to this
topic, it would receive this message itself published, this commit
provide a configure option to let user ignore the message itself published.
This change fix issue 1874.
* Small Fix
* Fix bug
* Better design
* Fix compile warning and improve coverage
* Better design to solve the performance issue
* Fix typo
* Fix typo
* Delete spaces in end of lines.
* Do not use anonymous function
* Better performance
2018-11-19 13:34:03 +08:00
cb835af42b
Fix bad comment
2018-11-19 10:49:05 +08:00
faeda253e1
Fix conflicts
2018-11-10 11:44:55 +08:00
997958aed1
Change the start_link API for emqx_client
...
Prior to this change, emqx_client:start_link does 2 works in one call:
- init an erlang process for emqx_client
- send MQTT CONNECT to remote broker
But this solution have some drawbacks:
- the return value of `start_link` compiles the return values of the 2
works: {ok, Pid, MqttResult}. It is inconsistent with the return value
of `gen_statem:start_link`, may causes confusions.
- the return mode of the 2 works are different:
`start_link` should always return {ok, Pid} or {error, Reason}, but
connecting to mqtt may throw out exceptions as it handles the
socket. But the caller couldn't have thought of the exception, he would
pattern match on the result of `emqx_client:start_link`, but it crashed!
- If the init work succeed but the connection failed, the caller couldn't
get a Pid from the return value, but indeed it was created inside the
emqx_client. This hides the fact that the Pid was created, and when the
Pid dies, the caller would receive an message from a Pid it doesn' know about.
This change divived these 2 work into 2 APIs:
- `start_link/1` is to build and verify the options, and returns {ok,Pid}
(on success) or {error, Reason} (on failure).
- `connect/1` is to send MQTT CONNECT, and returns {ok, MQTTResult::properties()} or
{error, MQTTReason}. MQTT reason codes will contains in the `MQTTReason`.
2018-11-09 17:43:04 +08:00
2dc8ec8b11
Bridge via TLS
2018-11-09 17:43:04 +08:00
f448c62e47
Fix config descriptions of ACL cache
2018-11-08 20:41:57 +08:00
92cc171aaf
Support tracing log files for specific topics or clients
2018-11-02 18:38:07 +08:00
94dbdffd59
New logger formatter with meta-data
2018-11-02 18:38:07 +08:00
2c63aef3f6
Update schema
2018-11-02 18:32:42 +08:00
1222dd0eab
Update log config template
2018-11-02 18:32:42 +08:00
46c7e86331
Fix some grammar
2018-11-02 18:32:42 +08:00
8f5b7a0d05
Optimize config for log section
2018-11-02 18:32:42 +08:00
ae743ad1f0
Rewrite emqx_mqueue.erl
...
Fixed bugs:
- Priority queue lack of a `len + 1` logic in `in/2`
Changed behaviors:
- Topics not found in priority table (from config) will be treated with default priority,
instead of hasing topic name to a priority number.
- Default priority is now configurable (it was always lower than all configured priorities)
- The dropped message due to reaching `max_len` is now returned from `in/2`,
so the queue owner (`in/2` caller) can perform autopsy on it
2018-10-27 14:21:53 +02:00
3f761cbe6a
Support use certifate as username
...
Prior to this change, you can just use CN or EN field from the client
certificate as username.
This change add a new option to allow user to use Certificate directly as
username.
2018-10-23 14:37:05 +08:00
4c40f75f4b
Request & Response (broker and client) ( #1819 )
...
Add request & response support for CONNECT & CONNACK
Prior to this change, there is no validate and specified process for
Request-Response-Information and Response-Information
Also added basic Request/Response functionality to emqx_client implementation
2018-10-18 19:21:05 +02:00
0adee194aa
Fix the refered link
...
Prior to this change, the refered wiki link in acl.conf has been
deprecated.
This change replace the deprecated link with the doc link in official site.
2018-10-19 01:03:09 +08:00
1bc175e0ce
Add mountpoint config to zone configs
2018-09-28 18:53:52 +08:00
d1c72b92af
Add 'sticky' dispatch strategy for shared subscription
2018-09-27 10:46:14 +08:00
db520b9b94
Disable the rate_limit of MQTT/TCP listener by default.
2018-09-25 22:46:37 +08:00
795ee300d1
Disable the publish_limit by default
2018-09-22 16:26:39 +08:00
5689ad3485
Fix issue #1847 .
...
Change the config of 'zone.$name.publish_limit'
2018-09-22 16:26:39 +08:00
8f35d13e17
Improve bridges design ( #1849 )
...
Improve the design of bridges
2018-09-22 16:19:28 +08:00
8653732bae
Revert "Calculate the 1.5 keep alive time exactly"
2018-09-22 14:52:31 +08:00
33f9e895ad
Merge branch 'emqx30' into more-gc-enforcement-policies
2018-09-22 05:52:41 +08:00
fbac9ce43e
Improve the foce_gc_policy config.
2018-09-22 05:42:38 +08:00
073bf481c9
Calculate the 1.5 keep alive time exactly
2018-09-20 15:51:28 +08:00
737dcff44e
Add space before plugins.etc_dir in emqx.conf
2018-09-14 19:13:43 +02:00
f5ed6ddb05
Change comments
2018-09-14 11:49:17 +08:00
5eb92e37cc
Remove check for MQTT path, and normalize code
2018-09-14 11:49:17 +08:00
6f536eaac4
Add customized mqtt path for websocket
2018-09-14 11:49:17 +08:00
88b3460715
Add feature for issue#1809
2018-09-14 11:49:17 +08:00
3045ec10ab
Add banned feature
2018-08-31 14:04:26 +08:00
e6bed24bb3
Add server_keepalive config
2018-08-31 00:32:56 +08:00
b0fad7a86d
Change the default value of 'zone.external.await_rel_timeout' to 300s
2018-08-30 21:02:01 +08:00
8ed6266ace
Add mqueue_type, mqueue_priorities options
2018-08-30 18:26:13 +08:00
18eee0f1b0
Fixed Conflicting files
2018-08-30 10:53:35 +08:00
53d7d0a9d4
Update the peer_cert_as_username conf desc
2018-08-30 10:35:20 +08:00
0fbf813ebf
Add mqtt connect tests cases
2018-08-30 10:35:04 +08:00
465963fec3
Merge branch 'emqx30' into emqx30-feng
2018-08-29 17:36:38 +08:00
8e11845f87
Remove ignore_loop_deliver option
2018-08-28 07:36:22 +08:00
d167a5c99a
Merge pull request #1748 from emqtt/emqx30-feng
...
Improve the emqx_listeners module
2018-08-27 16:24:59 +08:00
e5b2e584e9
Remove 'TODO:'
2018-08-27 15:57:36 +08:00
91eb79967c
Add syslog
2018-08-27 13:50:38 +08:00
9d29dd0e10
use config enable_acl_cache
2018-08-26 18:25:17 +08:00
8cd20744be
improve cache datastruct using keys-queue
2018-08-26 13:33:00 +08:00
a904031979
acl cache using proc_dict
2018-08-26 13:30:18 +08:00
4af6065984
For paho interoperability tests
2018-08-25 16:02:44 +08:00
68cfcf6e0e
Pass paho mqtt interoperability tests
2018-08-24 23:19:11 +08:00
694485252a
Merge branch 'emqx30-dev' of github.com:emqtt/emqttd into emqx30-dev
2018-08-24 18:43:36 +08:00
0f052ce352
Upgrade connection, protocol and session modules for MQTT 5.0
2018-08-24 18:39:59 +08:00
22e8b07a3d
Receive/send messages by bridge
2018-08-19 20:31:44 +08:00
d9004d4cfb
Add MQTT section in configuration file
2018-08-10 12:43:32 +08:00
3ac4be84e4
Remove 'listener.wss.external.handshake_timeout' for cowboy does not support this option
2018-08-09 14:26:39 +08:00
18116ac3b5
Remove etc/zone.conf
2018-08-09 09:32:56 +08:00
e23a6e87d8
Merge listeners, zones, bridges config
2018-08-08 19:37:57 +08:00
4cf1815030
Add more configurations for EMQ X R3.0
2018-08-08 19:23:32 +08:00
4d9e03a803
Refactor websocket conn using cowboy
2018-08-08 18:36:14 +08:00
7d0cba9427
Add MQTT 5.0 supports for connection, protocol and session modules
2018-08-06 16:33:10 +08:00
cbbc231210
Comment log.syslog.* to fix building issue
2018-07-19 10:08:37 +08:00
e2a34ec98d
Comment lager syslog to be compatible with Erlang/OTP R21
2018-07-19 09:34:49 +08:00
7ee54aac28
Add 'qos' field to message record
2018-07-18 23:41:00 +08:00
b3adcc8971
Add RPC Args
2018-07-18 14:24:35 +08:00
bbe56dabec
Fix whitespace
2018-04-25 15:37:30 +08:00
f4fd6efe16
Merge the emqx-common, emqx-router libraries
2018-02-26 23:29:53 +08:00
057ef7b668
Merge branch 'master'
2018-02-26 01:05:08 +08:00
fcb2ec8427
Merge the latest enterprise branch
2018-02-24 15:56:32 +08:00
b63c34ab14
Merge the latest master branch
2018-02-24 11:27:09 +08:00
91b64813fa
Modify tcp buffer config
2018-02-24 09:15:18 +08:00
a864aa9743
Modify tcp buffer config
2018-02-23 21:23:55 +08:00
98d63a1454
Comment 'node.ssl_dist_optfile' option by default
2018-02-16 21:15:30 +08:00
2674c145a9
Fix the 'inet_ssl' distribution module
2018-02-16 20:40:44 +08:00
6c4ec45888
Add etc/ssl_dist.conf file to configure SSL distribution
2018-02-16 18:41:15 +08:00
79902be40e
Fix issue #1492 - add 'node.ssl_dist_optfile' to support ssl distributation
2018-02-16 18:40:03 +08:00
bd0409879b
Add 'proxy_port_address', 'proxy_port_header' options for WebSocket listener
2018-01-28 15:26:56 +08:00
707d338b0e
Merge branch 'develop' into ws-proxy
2018-01-28 15:11:08 +08:00
f70bf23440
Add 'listener.<proto>.<name>.reuseaddr' option
2018-01-24 09:48:06 +08:00
94e1229abb
Uncomment the 'node.proto_dist' to support docker env
2018-01-23 16:32:53 +08:00
87ae76b6b4
Fix issue #1460 - Add node.proto_dist option to support inet6_dist
2018-01-23 15:22:05 +08:00
a1cbdc5122
Update emq.conf and emq.schema
2018-01-12 10:46:35 +08:00
a779c9f9cb
Add 'listener.wss.external.tls_versions' option
2018-01-04 20:25:26 +08:00
b98a320124
Improve documentation for all options
2018-01-04 15:32:21 +08:00
b2b78c178c
Add documenation for SSL configurations
2018-01-04 12:25:05 +08:00
a17fae30e2
Add more documentation for MQTT listeners
2018-01-03 22:44:54 +08:00
052f9638cb
Add more documentation for emq.conf
2018-01-02 20:47:25 +08:00
10ed4219db
Update documentation for R2 configurations
2017-12-31 15:10:45 +08:00
ed5e4d1857
Change the default value of mqtt.keepalive_backoff to 0.75
2017-12-27 21:30:17 +08:00
bcec25092b
Merge version 2.3.2 to X edition
2017-12-26 21:09:24 +08:00
985ab723df
Support for zone configuration
2017-12-26 21:01:03 +08:00
d5222dcc9b
Add proxy_protocol, proxy_protocol_timeout options for ws/wss
2017-12-25 20:38:09 +08:00
db954aeb6d
Support X.509 certificate based authentication with HAProxy
2017-12-15 19:23:50 +08:00
f1640f5b85
Merge emq24 to X branch
2017-12-07 11:02:44 +08:00
8e41aeeeb8
Add send_timeout, send_timeout_close options
2017-12-05 19:47:17 +08:00
a42fcb2c39
Fix conflicts
2017-12-05 16:34:18 +08:00
bceb72853d
Fix issue #1335 - Forward real client IP using a reverse proxy for websocket
2017-12-02 17:59:29 +08:00
a5e06308e5
Merge pull request #1366 from HJianBo/ws_proxy
...
Websocket proxy configuration
2017-12-02 12:35:04 +08:00
0716b2b2d0
Enable the stats of session by default
2017-12-02 12:13:55 +08:00
5006dbba6e
Add ws/wss proxy cofingurations for getting client original ip address
2017-12-01 22:12:27 +08:00
2611f660de
Fix issue #1353 - the management API should listen on 0.0.0:8080
2017-11-29 10:45:40 +08:00
99ed0e46b6
Remove RPC args
2017-11-22 17:07:11 +08:00
2cec86eba7
Merge with version 2.3.0
2017-11-21 14:14:12 +08:00
1545e18cd9
Remove the 'mqtt.pubsub.by_clientid' option
2017-11-17 20:55:11 +08:00
f31485f342
Update openssl pem file
2017-11-02 22:01:26 +08:00
97cf04d752
Add more lager configuration
2017-10-11 16:01:39 +08:00
2354a3dd5d
Fix the building errors
2017-10-10 15:50:40 +08:00
989d2fd9e7
Add more lager configuration
2017-10-10 13:10:34 +08:00
4b8cd18f5d
Merge with EMQ X project
2017-10-09 19:43:06 +08:00
88f84a4a0c
Support to configure keepalive backoff
2017-08-07 18:27:16 +08:00
09b4f17065
Merge the configuration of ekka
2017-07-23 18:42:54 +08:00
6350337d1d
Set cluster.discovery default by mcast
2017-07-22 10:09:53 +08:00
041b9100ed
Merge configurations of ekka library
2017-07-21 12:52:26 +08:00
8277707c1b
node.dist_listen_max = 6379
2017-07-18 19:03:45 +08:00
a23df7f16e
Support autocluster with IP Multicast
2017-07-18 18:39:02 +08:00
1ea630bc9e
Integrate with ekka library
2017-06-28 16:51:19 +08:00
e4ac8a56dd
Add 'cluster.cookie' configuration
2017-06-28 16:39:11 +08:00
f0804df014
Merge pull request #1094 from emqtt/develop
...
Add a new listener for HTTP REST API
2017-06-12 16:32:55 +08:00
6918a69a2b
Update listener.api configuration
2017-06-12 16:09:18 +08:00
0d1205962e
Update listener.api configuration
2017-06-09 15:04:53 +08:00
866c33f6fc
conflicts fixed
2017-06-09 14:55:03 +08:00
1a8cc2e146
Add http to listen on port 8080 for the http REST API
2017-06-09 14:54:03 +08:00
5eb590cf27
Merge pull request #1074 from emqtt/develop
...
Update the default value of 'mqtt.mqueue.max_length' to 1000
2017-05-27 11:28:35 +08:00
db6b501691
Update the default value of 'mqtt.mqueue.max_length' to 1000
2017-05-27 11:26:04 +08:00
b98ea3ec8e
Merge pull request #1060 from emqtt/develop
...
Add a 'websocket_protocol_header' option to handle WebSocket connection from WeChat
2017-05-19 16:59:34 +08:00
414f156d4a
Add websocket_protocol_header config
2017-05-19 16:46:14 +08:00
41dc80f32d
Add 'SSL Socket Options'
2017-05-08 12:39:16 +08:00
1691e9a9b6
Update node name
2017-05-02 14:33:23 +08:00
45ca461fd9
Add ignore self publish message
2017-03-30 14:41:29 +08:00
5c866d91b4
support cascading multiple acl modules
2017-03-30 09:43:35 +08:00
4f0bd74f87
#777
2017-03-29 15:28:24 +08:00
e469ffe7c7
Support multiple TCP/SSL listeners
2017-03-23 15:04:02 +08:00
f321bcdace
Support proxy protocol v1/2 config
2017-03-22 10:48:47 +08:00
942edad3c5
Merge branch 'emq22' into proxy-protocol
2017-03-22 10:18:44 +08:00
53572b7d37
Fix the comments of mqtt.session.* configurations
2017-02-24 20:38:35 +08:00
edd99dc5ed
Disable the force GC if conn_force_gc_count = 0
2017-02-23 18:53:16 +08:00
124aa454fb
Add 'mqtt.conn.force_gc_count' config to tune GC of MQTT connection
2017-02-23 16:53:47 +08:00
8e7ea09cbd
Tune the mqtt.client|session.enable_stats off
2017-02-22 17:34:00 +08:00
ff60578a7d
Change the datatype of 'enable_stats' to 'flag'
2017-02-21 18:46:10 +08:00
a52754df56
Add 'syslog' config and update client, session config
2017-02-16 10:51:03 +08:00
72ed291947
Replace the 'runner_' variables with 'platform_'
2017-01-12 11:56:30 +08:00
a5de6d0d1a
Merge branch 'master' into emq20
2017-01-12 11:01:17 +08:00
b892bc703b
vars template emq.conf
2017-01-11 19:05:42 +08:00
58046016f0
Change parameters order
2016-12-10 13:29:37 +08:00
b2cb5f98b6
Proxy Protocol V1
2016-11-27 18:10:22 +08:00
4af9a47f84
add mqtt.cache_acl option
2016-11-11 11:45:26 +08:00
06f5c8e2b7
Fix #754 - "-heart" option for EMQ 2.0
2016-11-09 09:53:29 +08:00
4bafcfa7a2
open https port: 8084
2016-11-08 13:49:59 +08:00
186d512038
fixed ssl opts fail_if_no_peer_cert
2016-11-07 13:40:52 +08:00
3db876781b
handshake_timeout change
2016-11-03 11:04:57 +08:00
eb9c11f321
remove modules
2016-10-31 20:26:56 +08:00
ccfabcfd0d
ssl handshake_timeout
2016-10-31 16:49:37 +08:00
830326178b
rm file
2016-10-31 15:23:59 +08:00
51944e1512
fixed ssl Multiple auth
2016-10-31 15:19:31 +08:00
3ab93e0e46
fixed ssl params
2016-10-26 11:50:04 +08:00
27bc669bee
WebSocket
2016-10-18 11:02:40 +08:00
8fb3a9a90c
fix some comments
2016-10-17 13:22:08 +08:00
d466950c01
Add README
2016-10-16 17:09:06 +08:00
3207bf47ec
etc/certs
2016-10-16 13:17:31 +08:00
99b63736d9
mv etc/ssl etc/certs
2016-10-16 13:17:17 +08:00
b0917e665c
etc/acl.conf
2016-10-15 13:49:51 +08:00
13c1fa8abf
add mqtt.acl_file config, and rm '#seconds'
2016-10-15 13:49:12 +08:00
96fd3c4ed8
https listener
2016-10-14 16:10:07 +08:00
7ac3416d51
modules
2016-10-14 14:25:21 +08:00
aaebef78cc
ssl certs
2016-10-14 12:53:08 +08:00
df968a804a
add ssl files
2016-10-14 10:55:27 +08:00
9f391f1542
Improve listener config
2016-10-14 10:49:40 +08:00
73659208a1
allow_anonymous
2016-10-13 19:09:49 +08:00
a01f642606
mqtt listeners
2016-10-13 17:37:32 +08:00
e26ed33f7f
rename emqttd.conf -> emq.conf
2016-10-12 19:30:34 +08:00
3cfac3430a
add etc/emqttd.conf, priv/emqttd.schema
2016-10-12 18:22:20 +08:00
d4979adddf
rm etc
2016-10-11 14:25:11 +08:00
b72e968684
move to emqttd-relx
2016-10-11 14:24:15 +08:00
c0c79e8171
rm gen_conf and emqttd_conf
2016-10-11 09:09:29 +08:00
54b496de67
cuttlefish conf
2016-10-09 15:33:41 +08:00
53e9b36ba4
listeners, modules
2016-10-08 19:57:28 +08:00
3406137433
new config
2016-10-08 18:38:33 +08:00
98a01b6bca
mv etc/* to rel/files
2012-12-26 15:28:25 +08:00
45647b5ca7
rebar release
2012-12-26 12:56:00 +08:00
a176312fa3
-smp true
2012-12-22 18:04:40 +08:00
c1b9449c53
fix sub/pub
2012-12-22 17:35:28 +08:00
425bc2157e
add auth support
2012-12-22 16:42:32 +08:00
efc1d9f424
add bin/ and some files
2012-12-21 17:33:21 +08:00
0fabf9feb2
tcp options
2012-12-20 17:35:02 +08:00
a77bbf33e2
first workable
2012-12-20 16:30:51 +08:00
cb04c9c7e5
add file
2012-12-19 13:42:03 +08:00
Gilbert Wong