Commit Graph

2398 Commits

Author SHA1 Message Date
Feng Lee
c015f72a90 Merge pull request #1135 from emqtt/develop
Add 'listeners restart/stop' Ctl command
2017-07-06 17:31:07 +08:00
turtled
87d2a7ca85 Review code 2017-07-06 16:17:36 +08:00
turtled
7054d2c575 Rename reopen -> restart 2017-07-06 16:05:02 +08:00
HuangDan
6f28c36fef Merge branch 'develop' of https://github.com/emqtt/emqttd into develop 2017-07-06 15:54:16 +08:00
HuangDan
f9cf00804f Add dialyze dependencies 2017-07-06 15:54:03 +08:00
turtled
5433af4c92 Add reopen/close ctl command 2017-07-06 14:49:17 +08:00
Feng Lee
3d284c9313 Merge pull request #1134 from emqtt/develop
Fix exit code of emqttd_ctl CLI
2017-07-06 12:34:34 +08:00
turtled
a427a53a30 Fix error exit code from emqttd_ctl 2017-07-06 11:25:05 +08:00
turtled
934287b926 Fix error exit code from emqttd_ctl 2017-07-06 10:52:27 +08:00
Feng Lee
604b001f39 Merge pull request #1122 from emqtt/develop
Add function restart_listener
2017-07-01 18:18:04 +08:00
turtled
88797062a4 Add function restart_listener 2017-07-01 17:51:55 +08:00
huangdan
aacda11244 Merge pull request #1108 from emqtt/develop
Update spec #1106
2017-06-21 11:06:12 +08:00
turtled
ae36a8c8c2 Update spec #1106 2017-06-21 10:11:34 +08:00
huangdan
99bd9ba19b Merge pull request #1100 from emqtt/develop
Remove from cluster, delete the node in extra_db_nodes
2017-06-13 21:35:07 +08:00
turtled
37b625aa57 Format code 2017-06-13 21:13:57 +08:00
turtled
88d466eb1a remove from cluster, delete the node in extra_db_nodes 2017-06-13 21:02:38 +08:00
huangdan
8bc0d77df6 Merge pull request #1099 from emqtt/develop
Stop the HTTP API Listener
2017-06-13 13:31:12 +08:00
turtled
bbcc082a0d Add stop api listener function 2017-06-13 11:15:26 +08:00
turtled
f18051c340 Add stop api listener function 2017-06-13 11:06:35 +08:00
Feng Lee
fa138882a3 Merge the updates of test case 2017-06-13 10:51:56 +08:00
Feng Lee
79c2fa631e Fix the issue that we cannot remove a down node from the cluster 2017-06-13 10:35:22 +08:00
Feng Lee
a5cac277c1 Add cluster_nodes/1 function 2017-06-13 10:33:56 +08:00
HuangDan
c0bb20c2d9 Remove bridge command qos option 2017-06-12 22:52:23 +08:00
huangdan
e444cc2d1a Merge pull request #1098 from emqtt/develop
Update test case for http api
2017-06-12 22:47:12 +08:00
HuangDan
de2e1f79e8 Update test case for http api 2017-06-12 22:45:39 +08:00
Feng Lee
470e76346f Merge pull request #1097 from emqtt/develop
Update listener.api schema
2017-06-12 21:58:55 +08:00
turtled
70507e893c Update listener.api schema 2017-06-12 21:54:51 +08:00
turtleDeng
0ec1f0ccf9 Merge pull request #1096 from emqtt/develop
Fix the race condition issue caused by unregister_session/1
2017-06-12 21:52:55 +08:00
Feng Lee
53f5188cbb Fix the race condition issue caused by unregister_session/1 2017-06-12 19:13:58 +08:00
Feng Lee
f0804df014 Merge pull request #1094 from emqtt/develop
Add a new listener for HTTP REST API
2017-06-12 16:32:55 +08:00
turtled
6918a69a2b Update listener.api configuration 2017-06-12 16:09:18 +08:00
turtled
4888702712 Remove bridge command qos option 2017-06-12 15:13:54 +08:00
turtled
0d1205962e Update listener.api configuration 2017-06-09 15:04:53 +08:00
turtled
866c33f6fc conflicts fixed 2017-06-09 14:55:03 +08:00
turtled
1a8cc2e146 Add http to listen on port 8080 for the http REST API 2017-06-09 14:54:03 +08:00
huangdan
034f39e811 Add ‘Compiled with option debug_info’ 2017-06-05 10:38:48 +08:00
huangdan
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
huangdan
db6b501691 Update the default value of 'mqtt.mqueue.max_length' to 1000 2017-05-27 11:26:04 +08:00
Feng Lee
fa10394f37 Merge pull request #1071 from emqtt/develop
Force gc call emit_stats
2017-05-26 18:16:34 +08:00
turtled
0f7a66f810 Force gc call emit_stats 2017-05-26 16:44:44 +08:00
turtled
dc2e6ab53c Hash type add bcrypt 2017-05-26 12:31:07 +08:00
Feng Lee
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
turtled
c64f172174 Emq-WebSocket-Protocol -> EMQ-WebSocket-Protocol 2017-05-19 16:55:14 +08:00
turtled
414f156d4a Add websocket_protocol_header config 2017-05-19 16:46:14 +08:00
Feng Lee
0ffa2d00d0 Add a 'websocket_protocol_header' option to fix the missing 'Sec-Websocket-Protocol' header of WeChat WebSocket Connection 2017-05-19 16:41:27 +08:00
Feng Lee
1de176a887 Merge pull request #1059 from emqtt/develop
Fixed issue #1045
2017-05-19 14:36:39 +08:00
turtled
94402f4297 Format code 2017-05-19 10:24:36 +08:00
turtled
96562dfc59 Format code 2017-05-19 10:22:07 +08:00
turtled
9c5ce15f46 Fixed http publish API missing params 2017-05-19 10:13:01 +08:00
turtled
8d4ec32d1a Fixed http publish API missing params 2017-05-19 10:09:34 +08:00