Commit Graph

16280 Commits

Author SHA1 Message Date
Feng Lee 1222746b79 Update copyright and format code 2017-02-16 11:21:31 +08:00
Feng Lee d93caa7c9e Update copyright and format code 2017-02-16 11:19:02 +08:00
Feng Lee 640c9287c2 Rename now_to_secs, now_to_ms functions 2017-02-16 11:18:37 +08:00
Feng Lee 796d5df1c0 Upgrade parse/2 function 2017-02-16 11:17:57 +08:00
Feng Lee 0019fb2b49 Change the message timestamp to 'os:timestamp()' 2017-02-16 11:10:47 +08:00
Feng Lee 9e0b2ed57b Update copyright and change the format of -type, -callback 2017-02-16 11:07:47 +08:00
Feng Lee cae247be97 Rename 'emqttd_hook' module to 'emqttd_hooks' 2017-02-16 10:56:53 +08:00
Feng Lee 4df2a71c27 Update copyright, format record, add 'AUTH' packet type for MQTT 5.0 2017-02-16 10:53:51 +08:00
Feng Lee a52754df56 Add 'syslog' config and update client, session config 2017-02-16 10:51:03 +08:00
Feng Lee 0bc071d792 Add emqttd_misc module 2017-02-16 10:48:31 +08:00
Feng Lee 08100525a5 Add inflight module and test suite 2017-02-16 10:44:00 +08:00
Feng Lee 61a54b4b33 Bump version to 2.1 2017-02-16 10:27:27 +08:00
Feng a59d5bb459 Rename the emqttd_time APIs 2017-02-15 22:05:28 +08:00
Chimit aefe0ab4ac Add ClientId parameter into the auth on HTTP Publish 2017-02-07 18:24:37 +08:00
Feng Lee ed05521725 Merge pull request #882 from varnerac/remove_gen_logger
Remove gen_logger references
2017-01-24 11:22:54 +08:00
Drew Varner 8e60b8f00a Remove gen_logger references 2017-01-23 20:02:02 -05:00
Feng Lee 153ed22da5 Merge pull request #868 from emqtt/emq20
Merge PR #864 from grutabow
2017-01-17 10:40:18 +08:00
Feng Lee eb05cfdca9 Merge pull request #864 from grutabow/master
Hook 'client.unsubscribe' need to handle 'stop'
2017-01-17 09:33:07 +08:00
Lei Chen 4606eaeb58 delete a comma. 2017-01-16 16:27:10 +08:00
Lei Chen ff6acbf293 Client unsubscribe hook does not handle 'stop' value.
Insert a statement to prevent calling emqttd_session:unsubscribe() if hook returns stop.
2017-01-16 16:24:19 +08:00
Feng Lee 448176c504 Merge pull request #857 from emqtt/emq20
Replace the 'runner_' variables with 'platform_'
2017-01-12 12:26:07 +08:00
Feng Lee 72ed291947 Replace the 'runner_' variables with 'platform_' 2017-01-12 11:56:30 +08:00
turtleDeng d62a374cc1 Merge pull request #856 from emqtt/emq20
Support variables in etc/emq.conf: {{ runner_etc_dir }}, {{ runner_etc_dir }}, {{ runner_data_dir }}
2017-01-12 11:20:00 +08:00
Feng Lee a5de6d0d1a Merge branch 'master' into emq20 2017-01-12 11:01:17 +08:00
turtled 96d053dbd1 Merge branch 'emq20' of https://github.com/emqtt/emqttd into emq20 2017-01-12 10:54:02 +08:00
Feng Lee 0cd4afaa8e Merge pull request #855 from emqtt/emq20
Copyright (c) 2016-2017
2017-01-12 10:49:06 +08:00
黄丹 101532980b Update emqttd_pmon.erl
Copyright (c) 2016-2017
2017-01-11 21:38:34 +08:00
Feng Lee 6af4badc0a Merge pull request #854 from emqtt/emq20
Copyright (c) 2012-2017
2017-01-11 21:12:52 +08:00
Feng Lee 56992cd48b Bump version to 2.0.7 2017-01-11 19:36:38 +08:00
huangdan 8092543efb Copyright (c) 2012-2017 2017-01-11 19:34:48 +08:00
turtled b892bc703b vars template emq.conf 2017-01-11 19:05:42 +08:00
Feng Lee 21576319d6 Merge branch 'emq20' into proxy-protocol 2017-01-11 15:29:47 +08:00
Feng Lee 9e0d8de37c Bump version to 2.0.7 2017-01-11 15:29:24 +08:00
huangdan 2e966a8cbd Mod Copyright (c) 2012-2017 2017-01-11 13:24:40 +08:00
Feng Lee 42d9e78b21 Merge pull request #851 from emqtt/emq20
Version 2.0.6
2017-01-08 16:08:11 +08:00
Feng 435d91c111 Version 2.0.6 2017-01-07 18:37:24 +08:00
Feng Lee 2d3d8a6d3a Merge pull request #837 from chimit/patch-1
Change "ok" message to uppercase
2016-12-27 18:12:40 +08:00
Chimit 06ca13531e Change "ok" message to uppercase 2016-12-27 17:21:27 +08:00
Feng Lee dc44c685cd Merge pull request #832 from emqtt/emq20
2.0.5
2016-12-23 15:51:31 +08:00
Feng Lee 9f56370f6b 2.0.5 2016-12-20 11:40:53 +08:00
Feng Lee f51007be32 Merge pull request #822 from emqtt/emq20
2.0.4 - Test cases for SSL connections
2016-12-14 21:31:02 +08:00
huangdan d7c5706b17 code review 2016-12-14 21:00:50 +08:00
Feng Lee 39c35c79de 2.0.4 2016-12-14 19:23:22 +08:00
huangdan 421ae007e8 code format 2016-12-14 19:15:32 +08:00
huangdan 4c9e031ece code format 2016-12-14 19:14:03 +08:00
huangdan b9220490bf code format 2016-12-14 19:11:37 +08:00
turtled 4aed3abb5e Merge branch 'emq20' of https://github.com/emqtt/emqttd into emq20 2016-12-14 18:10:00 +08:00
turtled 737a89d5e8 rm net_adm:ping 2016-12-14 18:09:41 +08:00
huangdan 776e6d9266 sslmut ct 2016-12-14 16:55:05 +08:00
huangdan aa46cc0145 ssl-oneway ct 2016-12-14 13:45:59 +08:00