tyler.durden
/
glass-isc-dhcp
mirror of https://github.com/Akkadius/glass-isc-dhcp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Clean up websockets - refactor code and add reconnection capability

This commit is contained in:
Akkadius 2017-09-06 01:49:07 -05:00
parent 8f3c5ae9f2
commit e3e3e0dde9
3 changed files with 60 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
public/assets/js/glass-pages/dhcp-logs.js
View File

@ -4,6 +4,7 @@ function log_action (action){
socket.send(JSON.stringify({"event_unsubscribe": "dhcp_log_subscription"}));
break;
case "start":
console.log('start readystate is ' + socket.readyState);
socket.send(JSON.stringify({"event_subscription": "dhcp_log_subscription"}));
break;
case "clear":
@ -36,52 +37,6 @@ function format_am_pm(date) {
return am_pm;
}
var killed_connection = 0;
if(typeof socket === "undefined") {
var socket = new WebSocket("ws://" + window.location.hostname + ":8080");
socket.onopen = function (event) {
console.log("socket is opened");
console.log("[Subscription] subscribing to dhcp log listen ");
};
socket.onmessage = function (event) {
if(killed_connection)
return false;
if(!document.getElementById("dhcp_log")){
console.log("[WS] DHCP Log unsubscribed");
socket.send(JSON.stringify({"event_unsubscribe": "dhcp_log_subscription"}));
killed_connection = 1;
return false;
}
if(document.getElementById("grep_fitler").value){
var matcher = new RegExp(document.getElementById("grep_fitler").value, "i");
var found = matcher.test(event.data);
if(!found){
return false;
}
}
var session = editor.session;
session.insert({
row: session.getLength(),
column: 0
}, "\n" + event.data);
if(session.getLength() >= 50000){
/* If we get over 500,000 lines lets clear the editor */
editor.setValue("");
}
var row = editor.session.getLength() - 1;
var column = editor.session.getLine(row).length; // or simply Infinity
editor.gotoLine(row + 1, column);
};
}
$('#dhcp_log').height($(window).height() * 0.6);
var editor = ace.edit("dhcp_log");

58
public/assets/js/glass-websockets.js Normal file
View File

@ -0,0 +1,58 @@
function check_websocket_connection () {
if(socket.readyState == 3) {
connect_websocket();
console.log("[Websocket] Connection lost... reconnecting...");
}
}
function connect_websocket() {
var killed_connection = 0;
delete socket;
socket = new WebSocket("ws://" + window.location.hostname + ":8080");
socket.onopen = function (event) {
console.log("[Websocket] socket is opened - readystate is " + socket.readyState);
};
socket.onmessage = function (event) {
if(killed_connection)
return false;
if(!document.getElementById("dhcp_log")){
console.log("[Websocket] DHCP Log unsubscribed");
socket.send(JSON.stringify({"event_unsubscribe": "dhcp_log_subscription"}));
killed_connection = 1;
return false;
}
if(document.getElementById("grep_fitler").value){
var matcher = new RegExp(document.getElementById("grep_fitler").value, "i");
var found = matcher.test(event.data);
if(!found){
return false;
}
}
var session = editor.session;
session.insert({
row: session.getLength(),
column: 0
}, "\n" + event.data);
if(session.getLength() >= 50000){
/* If we get over 500,000 lines lets clear the editor */
editor.setValue("");
}
var row = editor.session.getLength() - 1;
var column = editor.session.getLine(row).length; // or simply Infinity
editor.gotoLine(row + 1, column);
};
}
connect_websocket();
reconnect_timer = setInterval(function(){
check_websocket_connection ()
}, (1 * 1000));

3
public/templates/index.html
View File

@ -211,11 +211,10 @@
<script src="assets/js/api-examples.js"></script>
<script src="assets/js/glass-core.js"></script>
<script src="assets/js/glass-websockets.js"></script>
<script src="assets/js/file-saver.js"></script>
<script type="text/javascript">
function get_stats() {