From 55df1bae8ad77cd72536bb5fdaa2438ba99a5b3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Vest=C3=B8l?= Date: Tue, 12 Mar 2019 12:27:27 +0100 Subject: [PATCH] More typescript --- master.ts | 12 ++++++------ types/Request.d.ts | 10 ++++++++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/master.ts b/master.ts index d7cdfeea..abaf084b 100644 --- a/master.ts +++ b/master.ts @@ -210,15 +210,15 @@ app.get('/metrics', (req, res) => { }); function registerMoreMetrics(){ - for(let instanceID in slaves){ + for(let instanceID in db.slaves){ // playercount try{ - prometheusPlayerCountGauge.labels(instanceID, slaves[instanceID].instanceName).set(Number(slaves[instanceID].playerCount) || 0); + prometheusPlayerCountGauge.labels(instanceID, db.slaves[instanceID].instanceName).set(Number(db.slaves[instanceID].playerCount) || 0); }catch(e){} // UPS try{ - prometheusUPSGauge.labels(instanceID, slaves[instanceID].instanceName).set(Number(slaves[instanceID].meta.UPS) || 60); - if(slaves[instanceID].meta.tick && typeof slaves[instanceID].meta.tick === "number") prometheusUPSGauge.labels(instanceID, slaves[instanceID].instanceName).set(Number(slaves[instanceID].meta.tick) || 0); + prometheusUPSGauge.labels(instanceID, db.slaves[instanceID].instanceName).set(Number(db.slaves[instanceID].meta.UPS) || 60); + if(db.slaves[instanceID].meta.tick && typeof db.slaves[instanceID].meta.tick === "number") prometheusUPSGauge.labels(instanceID, db.slaves[instanceID].instanceName).set(Number(db.slaves[instanceID].meta.tick) || 0); }catch(e){} } // inventory @@ -229,8 +229,8 @@ function registerMoreMetrics(){ } // Slave count let numberOfActiveSlaves = 0; - for(let instance in slaves){ - if(Date.now() - Number(slaves[instance].time) < 1000 * 30) numberOfActiveSlaves++; + for(let instance in db.slaves){ + if(Date.now() - Number(db.slaves[instance].time) < 1000 * 30) numberOfActiveSlaves++; } prometheusConnectedInstancesCounter.set(numberOfActiveSlaves); } diff --git a/types/Request.d.ts b/types/Request.d.ts index 5ae49f82..c702e08c 100644 --- a/types/Request.d.ts +++ b/types/Request.d.ts @@ -1,3 +1,9 @@ interface Request { - route: {[name: string]: any} -} \ No newline at end of file + route?: any, + body?: requestBody, + } + interface requestBody extends Body { + unique: string, + + } + \ No newline at end of file