Fascinated/Minetrack
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

3.1.0 (#69)

Browse Source
This commit is contained in:
Cryptkeeper!
2017-03-14 17:07:58 -05:00
committed by GitHub
parent f1dfe2e21b
commit ac0ea0d5d7
11 changed files with 146 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/database.js
View File

@ -7,6 +7,8 @@ exports.setup = function() {
db.serialize(function() {
db.run('CREATE TABLE IF NOT EXISTS pings (timestamp BIGINT NOT NULL, ip TINYTEXT, playerCount MEDIUMINT)');
db.run('CREATE INDEX IF NOT EXISTS ip_index ON pings (ip, playerCount)');
db.run('CREATE INDEX IF NOT EXISTS timestamp_index on PINGS (timestamp)');
});
exports.log = function(ip, timestamp, playerCount) {
@ -19,6 +21,14 @@ exports.setup = function() {
insertStatement.finalize();
};
exports.getTotalRecord = function(ip, callback) {
db.all("SELECT MAX(playerCount) FROM pings WHERE ip = ?", [
ip
], function(err, data) {
callback(data[0]['MAX(playerCount)']);
});
};
exports.queryPings = function(duration, callback) {
var currentTime = util.getCurrentTimeMs();
@ -29,4 +39,4 @@ exports.setup = function() {
callback(data);
});
};
};
};

2
lib/mojang_services.js
View File

@ -77,4 +77,4 @@ exports.update = function(timeout) {
exports.toMessage = function() {
// This is what we send to the clients.
return serviceStates;
};
};

2
lib/server.js
View File

@ -44,7 +44,7 @@ function handleRequest(req, res) {
var categories = config.serverCategories;
// Legacy support for people without categories configured.
if (!categories) {
if (!categories || Object.keys(categories).length === 0) {
categories = {
'default': 'All Networks'
};

9
lib/util.js
View File

@ -111,7 +111,6 @@ exports.setIntervalNoDelay = function(func, delay) {
exports.convertServerHistory = function(sqlData) {
var serverIps = getServerIps();
var graphData = {};
var highestPlayerCount = {};
var startTime = exports.getCurrentTimeMs();
@ -124,9 +123,6 @@ exports.convertServerHistory = function(sqlData) {
if (!graphData[name]) graphData[name] = [];
graphData[name].push([entry.timestamp, entry.playerCount]);
if (!highestPlayerCount[entry.ip]) highestPlayerCount[entry.ip] = 0;
if (entry.playerCount > highestPlayerCount[entry.ip]) highestPlayerCount[entry.ip] = entry.playerCount;
}
// Break it into minutes.
@ -137,10 +133,7 @@ exports.convertServerHistory = function(sqlData) {
logger.info('Parsed ' + sqlData.length + ' ping records in ' + (exports.getCurrentTimeMs() - startTime) + 'ms');
return {
graphData: graphData,
highestPlayerCount: highestPlayerCount
};
return graphData;
};
exports.getBootTime = function() {