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
2269967f1a
Lazy evaluation when logging messages
...
Formatting variables and then passing them into the logger functions leads
to performance issues. i.e.
```erlang
logger:debug("RECV ~s", [emqx_packet:format(Packet)])
```
Above message will only be printed when the current log level set to
`debug`, but the function emqx_packet:format/1 will always be evaluated no
matter what the current log level is.
OTP 21 provides a special meta-data named `report_cb`, which can be used
for lazy evaluation. The fun is only evaluated if the primary/handler log level
check passes, and is therefore recommended if it is expensive to generate
the message.
2018-11-19 11:17:58 +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
cca27d1a5a
Change filesync_repeat_interval to no_repeat
2018-11-05 16:04:58 +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
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
e3f2ae8db8
Change from customized total heap size check to set process flag
...
The `max_heap_size` process flag can be used to limit total
heap size of a process, and it gives much more detailed
crash log if the limit is hit.
2018-09-29 21:36:34 +08:00
1bc175e0ce
Add mountpoint config to zone configs
2018-09-28 18:53:52 +08:00
925e98a3e5
Merge pull request #1823 from emqx/add-shared-sub-strategy
...
Add new shared subscription dispatch strategy
2018-09-22 19:30:08 +08:00
b35d37c92d
Add new shared subscription dispatch strategy
...
'random' was already there before this change
Added two new strategies: 'sticky' and 'round_robin'
'sticky' is made default as it is the cheapest
2018-09-22 10:50:34 +02: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
03f607c1b2
Fix issue#1833 and #1834 ( #1845 )
2018-09-22 16:10:24 +08:00
8653732bae
Revert "Calculate the 1.5 keep alive time exactly"
2018-09-22 14:52:31 +08:00
02ddcf37cd
Merge branch 'emqx30' into more-gc-enforcement-policies
2018-09-22 06:35:11 +08:00
3dfe4168cb
Change '0KB' to '0MB'
2018-09-22 06:24:41 +08:00
05a5ad0f8c
Use '0MB' to configure size of force_shutdown_policy
2018-09-22 06:14:43 +08:00
29787d8945
Use '0MB' to configure bytes of force_gc_policy
2018-09-22 06:08:53 +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
b61615323b
Move shutdown policy config to zone configs
2018-09-21 18:58:18 +02:00
6fca651a84
Add connection/session shutdown policy
...
The hibernation behaviour is also changed (implicitly) in this commit:
Prior to this change, connection/session always hibernates after
the stats timer expires regardless of messages in mailbox.
After this commit, connection/session process only goes to hibernate
when the timer expires AND there is nothing left in the mailbox to
process
2018-09-21 18:58:18 +02:00
f9f09f66dd
Add new shutdown-policy config schemas
2018-09-21 18:58:18 +02:00
721f237bc4
Rewrite emqx_gc.erl
...
The implementation prior to this commit supports
only one gc enforcement policy which is message count threshold.
The new implementation introduces 1 more: volume threshold based
2018-09-21 22:56:34 +08:00
073bf481c9
Calculate the 1.5 keep alive time exactly
2018-09-20 15:51:28 +08:00
e940c1c970
Rewrite emqx_gc.erl
...
The implementation prior to this commit supports
only one gc enforcement policy which is message count threshold.
The new implementation introduces 1 more: volume threshold based
2018-09-19 21:08:16 +02: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
c7928235c3
Remove check for MQTT path, and normalize code
2018-09-14 11:29:38 +08:00
e33414aca1
Add customized mqtt path for websocket
2018-09-14 10:10:32 +08:00
d29069a50d
Add feature for issue#1809
2018-09-12 15:17:18 +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
bbb58dad68
Change the default value of 'zone.external.await_rel_timeout' to 300s
2018-08-30 21:02:14 +08:00
7b58718280
Add mqueue_type, mqueue_priorities options
2018-08-30 18:26:31 +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
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
2e4fb3f946
emqttd -> emqx
2018-08-27 13:58:08 +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
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
f80cd2d986
Improve the MQTT over Websocket connection
2018-08-11 17:57:19 +08:00
bc8302dae9
Change default value of max_mqueue_len to 1000
2018-08-10 15:39:24 +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
854132d0c3
Add max_conn_rate, handshake_timeout options for wss listeners
2018-08-09 09:13:30 +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
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
c79fa29587
Fix the schema of lager console backend
2018-03-30 17:17:18 +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
2674c145a9
Fix the 'inet_ssl' distribution module
2018-02-16 20:40:44 +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
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
3a39706d84
Add more options for 'listener.wss.'
2018-01-04 16:05:44 +08:00
b2b78c178c
Add documenation for SSL configurations
2018-01-04 12:25:05 +08:00
bcec25092b
Merge version 2.3.2 to X edition
2017-12-26 21:09:24 +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
bceb72853d
Fix issue #1335 - Forward real client IP using a reverse proxy for websocket
2017-12-02 17:59:29 +08:00
5006dbba6e
Add ws/wss proxy cofingurations for getting client original ip address
2017-12-01 22:12:27 +08:00
aaf19787af
Remove the duplicated InfoHandler
2017-11-22 18:11:21 +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
c751e958db
Remove the translation for 'by_clientid'
2017-11-18 10:37:48 +08:00
1545e18cd9
Remove the 'mqtt.pubsub.by_clientid' option
2017-11-17 20:55:11 +08:00
97cf04d752
Add more lager configuration
2017-10-11 16:01:39 +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
d3f52898ee
Add Hot configuration plugin
2017-09-05 16:52:07 +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
041b9100ed
Merge configurations of ekka library
2017-07-21 12:52:26 +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
0067090d6a
Merge pull request #1101 from emqtt/emq22
...
Version 2.2-rc.1
2017-06-13 22:21:16 +08:00
70507e893c
Update listener.api schema
2017-06-12 21:54:51 +08:00
6918a69a2b
Update listener.api configuration
2017-06-12 16:09:18 +08:00
1a8cc2e146
Add http to listen on port 8080 for the http REST API
2017-06-09 14:54:03 +08:00
fbe4ee4eed
Merge pull request #1062 from emqtt/emq22
...
Version 2.2-beta.2
2017-05-20 11:03:40 +08:00
414f156d4a
Add websocket_protocol_header config
2017-05-19 16:46:14 +08:00
3e1c69dff1
Add cli listeners start|stop
2017-05-18 16:35:49 +08:00
2d6104fbd9
Ctl use clique
2017-05-11 16:02:38 +08:00
f730d011c4
Merge pull request #1038 from emqtt/emq22
...
Merge emq22 to master
2017-05-04 22:29:43 +08:00
b839fdc275
Merge pull request #986 from emqtt/emq20
...
merge emq20 branch code
2017-04-10 12:40:26 +08:00
ca03a84968
Merge pull request #973 from emqtt/emq20
...
syslog default level error
2017-03-31 15:32:26 +08:00
3573156e8f
syslog default level error
2017-03-31 15:31:50 +08:00
a125236220
fix windows branch conflicts
2017-03-31 14:47:25 +08:00
d8d96c1c6e
fix windows branch conflicts
2017-03-31 14:44:13 +08:00
45ca461fd9
Add ignore self publish message
2017-03-30 14:41:29 +08:00
acedcbbfd4
syslog handlers emqttd
2017-03-30 11:49:19 +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
6557dbe967
Change 'ssl' option to 'sslopts'
2017-03-13 15:08:29 +08:00
99c83dbe21
Add 'mqtt.listener.tcp.tune_buffer' config
2017-03-06 18:28:16 +08:00
71eaf285f7
Merge branch 'master' into windows
2017-02-24 11:06:03 +08:00
124aa454fb
Add 'mqtt.conn.force_gc_count' config to tune GC of MQTT connection
2017-02-23 16:53:47 +08:00
ff60578a7d
Change the datatype of 'enable_stats' to 'flag'
2017-02-21 18:46:10 +08:00
9468f71c2f
create windows branch
2017-02-20 19:21:28 +08:00
a52754df56
Add 'syslog' config and update client, session config
2017-02-16 10:51:03 +08:00
21576319d6
Merge branch 'emq20' into proxy-protocol
2017-01-11 15:29:47 +08:00
0f55fafcb3
rm 'hidden'
2016-12-06 15:24:15 +08:00
e550b80974
fix issue#796
2016-12-06 15:17:21 +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
a908c0b9d8
mqtt.queue.max_length: [integer, {atom, infinity}]
2016-11-09 09:28:39 +08:00
39837d3a93
fix queue.max_length
2016-11-08 17:35:29 +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
3ab93e0e46
fixed ssl params
2016-10-26 11:50:04 +08:00
6cfb1029d3
fix subscription
2016-10-18 16:01:16 +08:00
ce4a6d0eeb
mqtt.acl_file
2016-10-15 13:49:34 +08:00
96fd3c4ed8
https listener
2016-10-14 16:10:07 +08:00
d03b9dbcd3
lists:append/1
2016-10-14 14:42:21 +08:00
7ac3416d51
modules
2016-10-14 14:25:21 +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
ab4740c9ea
move to emqttd-relx/priv
2016-10-11 14:46:17 +08:00
ca4d567b00
broker_sys_interval
2016-10-11 09:46:55 +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
3406137433
new config
2016-10-08 18:38:33 +08:00
c42673ae79
rm priv
2015-06-22 21:02:20 +08:00
8702ab838c
0.9 project structure
2015-06-22 16:18:33 +08:00
spring2maz