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

remove graph smoothing behavior, add null playerCount support

Browse Source
This commit is contained in:
Nick Krecklow
2020-05-11 03:10:23 -05:00
parent 19190f8d79
commit ef0c41ee1d
5 changed files with 89 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/ping.js
View File

@ -92,8 +92,9 @@ class PingController {
const result = results[serverRegistration.serverId]
// Log to database if enabled
// Use null to represent a failed ping
if (config.logToDatabase) {
const playerCount = result.resp ? result.resp.players.online : 0
const playerCount = result.resp ? result.resp.players.online : null
this._app.database.insertPing(serverRegistration.data.ip, timestamp, playerCount)
}
@ -130,6 +131,12 @@ class PingController {
const version = serverRegistration.getNextProtocolVersion()
ping(serverRegistration, config.rates.connectTimeout, (err, resp) => {
if (Math.random() < 0.1) {
err = {
message: 'random fail'
}
resp = undefined
}
if (err) {
logger.log('error', 'Failed to ping %s: %s', serverRegistration.data.ip, err.message)
}

33
lib/servers.js
View File

@ -21,7 +21,8 @@ class ServerRegistration {
}
handlePing (timestamp, resp, err, version) {
const playerCount = resp ? resp.players.online : 0
// Use null to represent a failed ping
const playerCount = resp ? resp.players.online : null
// Store into in-memory ping data
this._pingHistory.push(playerCount)
@ -37,7 +38,7 @@ class ServerRegistration {
let updateHistoryGraph = false
if (config.logToDatabase) {
if (this.addGraphPoint(resp !== undefined, playerCount, timestamp)) {
if (this.addGraphPoint(playerCount, timestamp)) {
updateHistoryGraph = true
}
}
@ -142,37 +143,21 @@ class ServerRegistration {
for (const point of points) {
// 0 is the index of the timestamp
if (point[0] - lastTimestamp >= 60 * 1000) {
// This check tries to smooth out randomly dropped pings
// By default only filter pings that are online (playerCount > 0)
// This will keep looking forward until it finds a ping that is online
// If it can't find one within a reasonable timeframe, it will select a failed ping
if (point[0] - lastTimestamp >= 120 * 1000 || point[1] > 0) {
minutePoints.push(point)
lastTimestamp = point[0]
}
lastTimestamp = point[0]
// FIXME: update schema, remove timestamp
minutePoints.push(point)
}
}
if (minutePoints.length > 0) {
this.graphData = minutePoints
// Select the last entry to use for lastGraphDataPush
this._lastGraphDataPush = minutePoints[minutePoints.length - 1][0]
}
}
addGraphPoint (isSuccess, playerCount, timestamp) {
// If the ping failed, then to avoid destroying the graph, ignore it
// However if it's been too long since the last successful ping, push it anyways
if (this._lastGraphDataPush) {
const timeSince = timestamp - this._lastGraphDataPush
if ((isSuccess && timeSince < 60 * 1000) || (!isSuccess && timeSince < 70 * 1000)) {
return false
}
}
addGraphPoint (playerCount, timestamp) {
// FIXME: update schema, remove timestamp
this.graphData.push([timestamp, playerCount])
this._lastGraphDataPush = timestamp
// Trim old graphPoints according to #getMaxGraphDataLength
if (this.graphData.length > TimeTracker.getMaxGraphDataLength()) {