yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of github.com:emqtt/emqtt into dev

This commit is contained in:
Feng Lee 2015-05-28 21:55:48 +08:00
parent d3616a2701 5b36d1b677
commit 0476b6874a
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -7,6 +7,8 @@ emqttd ChangeLog
Bugfix: issue #138 - when client disconnected normally, broker will not publish disconnected $SYS message Bugfix: issue #138 - when client disconnected normally, broker will not publish disconnected $SYS message
Bugfix: fix websocket url in emqttd/priv/www/websocket.html
Improve: issue #136 - $SYS topics result should not include $SYS messages Improve: issue #136 - $SYS topics result should not include $SYS messages

2
apps/emqttd/priv/www/websocket.html
View File

@ -31,7 +31,7 @@
return document.getElementById(id); return document.getElementById(id);
} }
function go() { function go() {
ws = new WebSocket("ws://" + location.host + "/mqtt/wsocket"); ws = new WebSocket("ws://" + location.host + "/mqtt");
ws.onopen = function () { ws.onopen = function () {
$('connstate').innerHTML = 'CONNECTED'; $('connstate').innerHTML = 'CONNECTED';
} }

1
plugins/emqttd_dashboard

@ -1 +0,0 @@
Subproject commit 300bb74452764ac27c261ae000495791397b2a28