add timestamps to log

This commit is contained in:
Asraelite 2016-03-27 12:01:39 +01:00
parent 663305bd23
commit 0ea163dfb7
6 changed files with 43 additions and 14 deletions

View file

@ -2,8 +2,4 @@
'use strict'; 'use strict';
const packageJson = require('./package.json');
console.log(`Wingbase version ${packageJson.version} running.`);
require('./server/')(); require('./server/')();

View file

@ -76,7 +76,7 @@ class Physics {
var r = 0.1; var r = 0.1;
var body = game.world.bodies[i]; var body = game.world.bodies[i];
var pos = body.getPos(); var pos = body.getPos();
if (Math.abs(body.r - pos.r) > 0.3) pos.r = body.r; if (Math.abs(body.r - pos.r) > 1) pos.r = body.r;
var x = (body.x * r + pos.x) / (r + 1); var x = (body.x * r + pos.x) / (r + 1);
var y = (body.y * r + pos.y) / (r + 1); var y = (body.y * r + pos.y) / (r + 1);
var r = (body.r * r + pos.r) / (r + 1); var r = (body.r * r + pos.r) / (r + 1);

View file

@ -6,7 +6,7 @@ const Connection = require('./connection.js');
class GameNet { class GameNet {
constructor(server) { constructor(server) {
this.io = socketio(starbugs.webServer.appServer); this.io = socketio(wingbase.webServer.appServer);
this.server = server; this.server = server;
this.connections = new Map(); this.connections = new Map();

View file

@ -14,7 +14,7 @@ class Room {
} }
add(player) { add(player) {
console.log(`${player.name} joined ${this.name}.`); wingbase.log(`${player.name} joined ${this.name}.`);
player.room = this; player.room = this;
player.connection.room = this.name; player.connection.room = this.name;
this.players.add(player); this.players.add(player);
@ -24,7 +24,7 @@ class Room {
} }
remove(player) { remove(player) {
console.log(`${player.name} left ${this.name}.`); wingbase.log(`${player.name} left ${this.name}.`);
this.players.delete(player); this.players.delete(player);
this.teamA.delete(player); this.teamA.delete(player);
this.teamB.delete(player); this.teamB.delete(player);
@ -32,7 +32,7 @@ class Room {
if (this.players.size == 0) { if (this.players.size == 0) {
this.stop(); this.stop();
starbugs.gameServer.deleteRoom(this.name); wingbase.gameServer.deleteRoom(this.name);
} }
} }

View file

@ -1,11 +1,14 @@
'use strict'; 'use strict';
const WebServer = require('./web/');
const GameServer = require('./game/'); const GameServer = require('./game/');
const WebServer = require('./web/');
const ServerInterface = require('./interface.js');
class StarbugsServer { const packageJson = require('../package.json');
class WingbaseServer extends ServerInterface {
constructor() { constructor() {
super();
} }
start() { start() {
@ -14,12 +17,14 @@ class StarbugsServer {
this.webServer.start(); this.webServer.start();
this.gameServer.start(); this.gameServer.start();
this.log(`Wingbase version ${packageJson.version} running.`);
} }
} }
function init() { function init() {
global.starbugs = new StarbugsServer(); global.wingbase = new WingbaseServer();
starbugs.start(); wingbase.start();
} }
module.exports = init; module.exports = init;

28
server/interface.js Normal file
View file

@ -0,0 +1,28 @@
'use strict';
require('colors');
class ServerInterface {
constructor() {
}
log(msg) {
let pad = (str, len, right) => {
str = '' + str;
return (right ? str : '') +
Array(len > str.length ? 1 + len - str.length : 0)
.join('0') + (right ? '' : str);
}
let d = new Date();
let timestamp =
`<${pad(d.getUTCHours(), 2)}:` +
`${pad(d.getUTCMinutes(), 2)}:` +
`${pad(d.getUTCSeconds(), 2)}.` +
`${pad(('' + d.getUTCMilliseconds()).slice(0, 2), 2, true)}> `;
console.log(timestamp.gray, msg);
}
}
module.exports = ServerInterface;