RLGWebD: rlgwebd.js comparison

comparison rlgwebd.js @ 26:9b58f8d3ea70

rlgwebd.js: add timestamps to log messages. Wrap console.log() with the tslog() function, which prepends timestamps. Clean up some of the messages as well.

author	John "Elwin" Edwards <elwin@sdf.org>
date	Mon, 04 Jun 2012 10:19:36 -0700
parents	21de24c08aed
children	83f9a799a374

comparison

equal deleted inserted replaced

-:f275d816e857
+:9b58f8d3ea70
 clearTimeout(this.Qtimeout);
 this.Qtimeout = null;
 }
 }
 else if (oindex > 0 && oindex <= 1024) {
-console.log("Stashing message " + n + " at " + (oindex - 1));
+tslog("Stashing message %d at %d", n, oindex - 1);
 this.msgQ[oindex - 1] = data;
 if (!this.Qtimeout) {
 var nextn = this.nrecv + this.msgQ.length + 1;
 this.Qtimeout = setTimeout(this.flushQ, 30000, this, nextn);
 }
 /* Now set another timeout if necessary. */
 if (session.msgQ.length != 0) {
 var nextn = session.nrecv + session.msgQ.length + 1;
 session.Qtimeout = setTimeout(session.flushQ, 30000, session, nextn);
 }
-console.log("Flushing queue for session " + session.sessid);
+tslog("Flushing queue for session %s", session.sessid);
 };
 this.read = function () {
 if (this.data.length == 0)
 return null;
 var pos = 0;
 else
 ss.remove();
 };
 this.remove = function () {
 delete sessions[ss.sessid];
-console.log("Session " + this.sessid + " removed.");
+tslog("Session %s removed.", this.sessid);
 };
 }
 /* A few utility functions */
 function timestamp() {
 rnum = Math.floor(Math.random() * 65536 * 65536);
 hexstr = rnum.toString(16);
 while (hexstr.length < 8)
 hexstr = "0" + hexstr;
 return hexstr;
+}
+function tslog() {
+arguments[0] = new Date().toISOString() + ": " + String(arguments[0]);
+console.log.apply(console, arguments);
 }
 /* Returns a list of the cookies in the request, obviously. */
 function getCookies(req) {
 cookies = [];
 var password = formdata["pw"];
 var gname = formdata["game"];
 var dims = [formdata["h"], formdata["w"]];
 if (!(gname in games)) {
 sendError(res, 2, "No such game: " + gname);
-console.log("Request for nonexistant game \"" + gname + "\"");
+tslog("Request for nonexistant game \"%s\"", gname);
 return;
 }
 var progressdir = "/dgldir/inprogress-" + games[gname].uname;
 // This sets up the game once starting is approved.
 res.writeHead(200, {'Content-Type': 'text/plain'});
 var reply = {"t": "l", "id": nsession.sessid, "w": nsession.w, "h":
 nsession.h};
 res.write(JSON.stringify(reply));
 res.end();
-console.log("%s playing %s (key %s, pid %d)", username, gname,
+tslog("%s playing %s (key %s, pid %d)", username, gname,
 nsession.sessid, nsession.child.pid);
 }
 else {
 sendError(res, 5, "Failed to open TTY");
-console.log("Unable to allocate TTY for " + gname);
+tslog("Unable to allocate TTY for %s", gname);
 }
 }
 function checkit(code, signal) {
 // check the password
 if (code != 0) {
 sendError(res, 3);
 if (code == 1)
-console.log("Password check failed for user " + username);
+tslog("Password check failed for user %s", username);
 else if (code == 2)
-console.log("Attempted login by nonexistent user " + username);
+tslog("Attempted login by nonexistent user %s", username);
 else
-console.log("Login failed: sqlickrypt error " + code);
+tslog("Login failed: sqlickrypt error %d", code);
 return;
 }
 // check for an existing game
 fs.readdir(progressdir, function(err, files) {
 if (!err) {
 var fre = RegExp("^" + username + ":");
 for (var i = 0; i < files.length; i++) {
 if (files[i].match(fre)) {
 sendError(res, 4, null);
-console.log(username + " is already playing " + gname);
+tslog("%s is already playing %s", username, gname);
 return;
 }
 }
 }
 // If progressdir isn't readable, start a new game anyway.
 else
 email = formdata["email"];
 function checkreg(code, signal) {
 if (code == 4) {
 sendError(res, 2, "Invalid characters in name or email.");
-console.log("Attempted registration: " + uname + " " + email);
+tslog("Attempted registration: %s %s", uname, email);
 }
 else if (code == 1) {
 sendError(res, 2, "Username " + uname + " is already being used.");
-console.log("Attempted duplicate registration: " + uname);
+tslog("Attempted duplicate registration: %s", uname);
 }
 else if (code != 0) {
 sendError(res, 0, null);
-console.log("sqlickrypt register failed with code " + code);
+tslog("sqlickrypt register failed with code %d", code);
 }
 else {
 res.writeHead(200, {'Content-Type': 'text/plain'});
 var reply = {"t": "r", "d": uname};
 res.write(JSON.stringify(reply));
 res.end();
-console.log("Added new user: " + uname);
+tslog("Added new user: %s", uname);
 regsetup(uname);
 }
 }
 var child_adder = child_process.spawn("/bin/sqlickrypt", ["register"]);
 child_adder.on("exit", checkreg);
 process.on("exit", function () {
 for (var sessid in sessions) {
 if (sessions[sessid].alive)
 sessions[sessid].child.kill('SIGHUP');
 }
-console.log("Quitting...");
+tslog("Quitting...");
 return;
 });
 /* Initialization STARTS HERE */
 process.env["TERM"] = "xterm-256color";
 if (process.getuid() != 0) {
-console.log("Not running as root, cannot chroot.");
+tslog("Not running as root, cannot chroot.");
 process.exit(1);
 }
 try {
 process.chdir(chrootDir);
 }
 catch (err) {
-console.log("Cannot enter " + chrootDir + " : " + err);
+tslog("Cannot enter %s: %s", chrootDir, err);
 process.exit(1);
 }
 try {
 daemon.chroot(chrootDir);
 }
 catch (err) {
-console.log("chroot to " + chrootDir + " failed: " + err);
+tslog("chroot to %s failed: %s", chrootDir, err);
 process.exit(1);
 }
 try {
 // drop gid first, that requires UID=0
 process.setgid(dropToGID);
 process.setuid(dropToUID);
 }
 catch (err) {
-console.log("Could not drop permissions: " + err);
+tslog("Could not drop permissions: %s", err);
 process.exit(1);
 }
 http.createServer(handler).listen(8080, "127.0.0.1");
-console.log('rlgwebd running at http://127.0.0.1:8080/');
+tslog('rlgwebd running at http://127.0.0.1:8080/');