Skip to content

Error handling around websocket.send() #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lahjnus wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Error handling around websocket.send() #25

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c3cd383
Error handling on websocket.send
lahjnus Mar 20, 2013
14e1944
ErAdded log message to ws.send error
lahjnus Mar 20, 2013
0b05d29
reset host adressto local
lahjnus Mar 20, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 26 additions & 4 deletions wpilots.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,12 @@ function start_gameserver(maps, options, shared) {

if (connection.last_ping + 2000 < time) {
connection.last_ping = time;
connection.send(JSON.stringify([PING_PACKET]));
try {
connection.send(JSON.stringify([PING_PACKET]));
} catch (err) {
log(connection + ' send error (Reason: ' + err + ')');
return;
}
}
if (update_tick % connection.update_rate != 0) {
continue;
Expand Down Expand Up @@ -431,7 +436,12 @@ function start_gameserver(maps, options, shared) {
for(var id in connections) {
var conn = connections[id];
if (conn.state == JOINED) {
conn.send(JSON.stringify([OP_WORLD_RECONNECT]));
try {
conn.send(JSON.stringify([OP_WORLD_RECONNECT]));
} catch (err) {
log(conn + ' send error (Reason: ' + err + ')');
return;
}
conn.set_state(HANDSHAKING);
}
}
Expand Down Expand Up @@ -613,7 +623,12 @@ function start_gameserver(maps, options, shared) {
} else {
for(var id in connections) {
var conn = connections[id];
conn.send(JSON.stringify([OP_WORLD_RECONNECT]));
try{
conn.send(JSON.stringify([OP_WORLD_RECONNECT]));
} catch (err) {
log(conn + ' send error (Reason: ' + err + ')');
return;
}
conn.set_state(HANDSHAKING);
}
}
Expand Down Expand Up @@ -700,7 +715,13 @@ function start_gameserver(maps, options, shared) {
*/
conn.post = function(data) {
var packet = JSON.stringify(data);
this.send(packet);
try {
this.send(packet);
} catch (err){
log(this + ' send error (Reason: ' + err + ')');
return;
}

}

/**
Expand All @@ -722,6 +743,7 @@ function start_gameserver(maps, options, shared) {
this.send('[' + GAME_PACKET + ',[' + packet_data.join(',') + ']]');
this.data_sent += data_sent;
} catch (err) {
log(this + ' send error (Reason: ' + err + ')');
return;
}

Expand Down