Commit Graph

7749 Commits

Author SHA1 Message Date
Feng Lee 0044514a87 rename 'users_table' plugin config to 'user_table': 2015-06-02 15:29:53 +08:00
Feng Lee ebad80d690 Merge branch 'master' into dev 2015-06-02 12:56:13 +08:00
Feng Lee 5a75e59dd1 fix mysql auth error 2015-06-02 12:52:40 +08:00
huangdan de3b0fb8c0 ports_type 2015-06-01 23:13:34 +08:00
Feng Lee f3dbb7ba54 0.8.2 2015-06-01 17:45:45 +08:00
Feng Lee bc4c8a9401 0.8.2 2015-06-01 17:05:13 +08:00
Feng Lee 391dacee19 Merge branch 'master' of github.com:emqtt/emqtt 2015-06-01 16:42:21 +08:00
Feng Lee 8aa2b8fbed fix the issue that websocket client cannot subscribe '/queue/#' 2015-06-01 16:41:59 +08:00
Feng Lee 5c376b8511 Merge branch 'master' of github.com:emqtt/emqtt 2015-06-01 12:38:11 +08:00
Feng Lee 4c38cb37f5 use re:replace/4 to fill username 2015-06-01 12:36:30 +08:00
huangdan 1257b53951 ets info 2015-06-01 12:19:54 +08:00
huangdan 228e6bd6fb processgc ,leader_process info 2015-05-31 22:14:16 +08:00
huangdan e81e8c92a0 process list 2015-05-31 20:08:42 +08:00
huangdan 4d6e68e2ed memory usage unused 2015-05-31 16:27:46 +08:00
Feng Lee 253717d5a1 ordered_set 2015-05-31 11:40:07 +08:00
Feng Lee 73cb2389d9 add 'sys' flag for mqtt_message 2015-05-31 11:38:26 +08:00
huangdan 35cf9d4b6a scheduler_usage、memory、used allocated Erlang data 2015-05-30 21:54:59 +08:00
Feng Lee 824078c6b8 Merge branch 'master' into dev 2015-05-30 12:51:56 +08:00
Feng Lee d6f65cebc6 tests 2015-05-30 12:43:30 +08:00
Feng Lee dabddbb6d4 up 2015-05-29 16:36:39 +08:00
Feng Lee a5e594e1e3 0.8.1 2015-05-29 16:32:48 +08:00
Feng Lee 37a89c3a44 allow all for websocket 2015-05-29 16:07:43 +08:00
Feng Lee d1ae443650 0.8.1 2015-05-29 16:05:17 +08:00
Feng Lee f25ceb1b2b ignore examples 2015-05-29 15:53:47 +08:00
Feng Lee b18b35ff7c rm emqttd_amqp 2015-05-29 15:50:36 +08:00
Feng Lee 5a2dfd2a10 presence and misc fix 2015-05-29 09:54:51 +08:00
Feng Lee 230a348f51 0.9.0 2015-05-29 00:53:47 +08:00
Feng Lee e0bbc72f91 client manager 2015-05-29 00:52:05 +08:00
Feng Lee 0476b6874a Merge branch 'dev' of github.com:emqtt/emqtt into dev 2015-05-28 21:55:48 +08:00
Feng Lee d3616a2701 client presence management 2015-05-28 21:55:20 +08:00
huangdan 2ee3010319 vm ports 2015-05-28 21:04:22 +08:00
Feng Lee 54245b61eb tests 2015-05-28 18:49:54 +08:00
Feng Lee 5b36d1b677 Merge branch 'master' into dev 2015-05-28 10:07:18 +08:00
Feng Lee f84a99f05f 0.8.1 2015-05-28 09:47:02 +08:00
Feng Lee 3ed65b419c fix websocket url 2015-05-28 09:45:37 +08:00
Feng Lee f165321d2b rm 2015-05-28 09:37:50 +08:00
Feng Lee b96206e1ae mv to emqttd_plugin_mysql project 2015-05-28 01:28:33 +08:00
Feng Lee 2b19f12e25 ldap 2015-05-28 01:27:22 +08:00
Feng Lee 4f83c40b62 eldap 2015-05-28 01:26:40 +08:00
Feng Lee 500b9cb4f8 rm plguins/emqttd_auth_plugins 2015-05-28 01:11:36 +08:00
Feng Lee 3c00b26fe2 submodule 2015-05-28 01:02:02 +08:00
Feng Lee 5eed2f1d7f rm emqttd_dashboard 2015-05-28 00:54:20 +08:00
Feng Lee c383602783 {incl_cond, exclude} 2015-05-28 00:30:55 +08:00
Feng Lee b94fd7ffd6 mod presence 2015-05-27 15:32:49 +08:00
Feng Lee 750fb939b1 mod presence 2015-05-27 15:32:04 +08:00
Feng Lee 2e2d770c27 ingore *.so 2015-05-27 13:20:40 +08:00
Feng Lee 8bd867325c Merge branch 'plugins' into dev 2015-05-27 13:16:52 +08:00
Feng Lee 954d46cab3 timestamp/0 2015-05-27 13:14:26 +08:00
Feng Lee 4282c135d5 Merge pull request #141 from kimiscircle/master
add mysql acl, auth plugin
2015-05-27 13:13:37 +08:00
hippp 754a2409e2 add mysql acl, auth plugin
1. add pbkdf2 secure password hasher
2. acl table should like |username|topic|rw| in mysql where rw=1 means
read, rw=2 means write, where username = '*' means any user's username  in this
change
3. note plugin.config  no work here, but this is a working
diff when default value is right
2015-05-27 08:34:28 +08:00