Commit Graph

7749 Commits

Author SHA1 Message Date
Feng Lee d31a0ea7dc Merge pull request #944 from emqtt/develop
V2.1.0-beta.2: Add more test cases
2017-03-13 16:31:58 +08:00
Feng Lee f48def7657 Merge branch 'emq20' of github.com:emqtt/emqttd into emq20 2017-03-13 16:31:13 +08:00
Feng Lee 2e6e97b006 Fix the syntax error 2017-03-13 16:30:41 +08:00
HuangDan 433c2304ac Merge branch 'emq20' into develop 2017-03-13 16:08:32 +08:00
HuangDan 524dce40dd Fix test case 2017-03-13 16:08:22 +08:00
Feng Lee c17d936b20 Merge branch 'master' into emq20 2017-03-13 16:03:37 +08:00
Feng Lee 1de9496b4e Upgrade Erlang/OTP to R19+ 2017-03-13 16:01:48 +08:00
Feng Lee 82bb7766ac Add env, maintainers, licenses properties 2017-03-13 15:55:00 +08:00
Feng Lee d099d0b53c Add emqttd_gc:maybe_force_gc/3 API and tune the min hibernate interval 2017-03-13 15:36:58 +08:00
Feng Lee 6557dbe967 Change 'ssl' option to 'sslopts' 2017-03-13 15:08:29 +08:00
Feng Lee 056dc747ad Depend on emq20 branch of esockd library 2017-03-13 14:56:59 +08:00
Feng Lee 05396f0ade Add pbkdf2 dependencies and fix the building errors 2017-03-13 13:30:49 +08:00
Feng Lee 90e46325df Fix the crash caused by keepalive:start/3 2017-03-13 12:42:02 +08:00
Feng Lee 0df59934c7 Fix the GPROC_POOL macro 2017-03-13 12:14:57 +08:00
Feng Lee bb91bc04c6 Merge pull request #941 from callbay/issue#935
Fix Issue#935
2017-03-13 11:41:22 +08:00
Feng Lee 9b6c91cbad Merge pull request #940 from emqtt/emq20
V2.1.0-beta.2:Support pbkdf2 hash
2017-03-13 10:13:09 +08:00
Frank Feng 7cb3b7ca8a Id -> I 2017-03-12 23:07:45 +08:00
Frank Feng 6472457342 Match {error,einval} 2017-03-12 23:06:57 +08:00
huangpengju 61a71e7559 update emqttd_auth_mod.erl code format 2017-03-12 11:49:26 +08:00
Feng Lee bd8b446a54 Merge pull request #938 from emqtt/pbkdf2
Support pbkdf2 hash
2017-03-10 08:21:14 +08:00
huangpengju b5ff80499a Update emqttd_auth_mod.erl 2017-03-09 09:29:31 +08:00
huangpengju 78b0f66910 Update Makefile 2017-03-09 09:29:03 +08:00
huangpengju 25c25826a7 Update Makefile 2017-03-09 09:28:28 +08:00
huangpj fba79b3e25 support pbkdf2 2017-03-08 18:01:59 +08:00
Feng Lee e008d149d3 Update comments and misc fix 2017-03-06 18:57:29 +08:00
Feng Lee 7c90e08f57 Fix the subscrptions print 2017-03-06 18:48:29 +08:00
Feng Lee 14d28d59bd Rename the 'Timestamp' variable to 'TS' 2017-03-06 18:47:50 +08:00
Feng Lee f2a818a4a4 Rename the PUBSUB macro to PS 2017-03-06 18:46:09 +08:00
Feng Lee dae3d22bef Remove the io:format line 2017-03-06 18:43:44 +08:00
Feng Lee 99c83dbe21 Add 'mqtt.listener.tcp.tune_buffer' config 2017-03-06 18:28:16 +08:00
Feng Lee 35e08df735 Change the default QoS of will message to QOS_1 2017-03-06 18:17:07 +08:00
Feng Lee c3919a64e6 Format 'trie_node' record 2017-03-06 18:13:07 +08:00
Feng Lee 98e15ebbf4 Prepare for MQTT/5.0 2017-03-06 18:11:09 +08:00
Feng Lee 3d0bc15e93 Use the '?assertEqual' macro and update Copyright info 2017-03-06 18:06:15 +08:00
huangdan 4de8c0921e Add test case 2017-03-04 16:23:13 +08:00
turtleDeng 80a7cbf09e Merge pull request #930 from buxizhizhoum/master
Edit the note of tick timer
2017-03-04 11:47:34 +08:00
buxizhizhoum 93719a13f3 Edit the note of tick timer 2017-03-03 22:05:26 +08:00
Feng Lee c412f6d5ed Merge pull request #920 from phanimahesh/master
Please add src/emqttd.app.src
2017-02-27 23:57:42 +08:00
J Phani Mahesh a71a061305
add app.src,rebar.lock, ignores for rebar3
Having src/emqttd.app.src allows rebar family of build tools
(rebar2, and rebar3) to be used to compile emqttd. This is important
to allow plugins to be written using rebar3, to lock dependencies.

rebar.lock contains references to commits or hashes of dependencies
and is used by rebar3 to allow repeatable builds.

This is important since without it, updates to dependencies are
silently pulled and it is impractical to replicate a build properly.

However, this adds an additional maintenance effort. Periodically,
the lock file must be updated using rebar3 upgrade, and app.src
must be updated when adding new dependencies.

Note that erlang.mk does not respect dependency locking currently,
and does not benefit from rebar.lock.

_build is used by rebar3 and mix for storing built artifacts.
2017-02-27 14:19:04 +05:30
Feng 53572b7d37 Fix the comments of mqtt.session.* configurations 2017-02-24 20:38:35 +08:00
huangdan 71eaf285f7 Merge branch 'master' into windows 2017-02-24 11:06:03 +08:00
Feng Lee 331d016c8e Merge pull request #917 from emqtt/emq20
V2.1.0-beta.1: Tune the CPU/Memory usage of Client/Session Processes
2017-02-23 23:26:13 +08:00
Feng 1e91c0e220 Format code 2017-02-23 23:01:20 +08:00
Feng 440011da9a Rename 'Pkt' to 'PktCnt', 'Msg' to 'MsgCnt' 2017-02-23 23:00:55 +08:00
Feng 9309baf17c Rename mqtt_msgid() type to mqtt_msg_id() 2017-02-23 22:59:26 +08:00
Feng Lee edd99dc5ed Disable the force GC if conn_force_gc_count = 0 2017-02-23 18:53:16 +08:00
Feng Lee 1e36750288 Use emqttd_gc:reset_conn_gc_count/2 API 2017-02-23 17:40:50 +08:00
Feng Lee 5ef4fce141 Handle the {ok, I} return 2017-02-23 17:26:29 +08:00
Feng Lee e972103f74 Fix the 'spawn_opt' options 2017-02-23 17:25:44 +08:00
Feng Lee 73847b96fc Add 'FULLSWEEP_OPTS' macro 2017-02-23 17:16:55 +08:00