fix(status): Clean up status report

src/framework/services/RabbitMq.ts

@@ -223,8 +223,6 @@ export class RabbitMqService extends IMService {
 	}
 
 	public async sendStatusToManager(err?: Error) {
-		const req = (this.client as any).requestHandler;
-
 		await this.sendToManager({
 			id: 'status',
 			cmd: ShardCommand.STATUS,
@@ -239,26 +237,10 @@ export class RabbitMqService extends IMService {
 			gateway: this.client.gatewayConnected,
 			guilds: this.client.guilds.size,
 			error: err ? err.message : null,
-			tracking: {
-				pendingGuilds: this.client.tracking.pendingGuilds.size,
-				initialPendingGuilds: this.client.tracking.initialPendingGuilds
-			},
-			music: {
-				connections: this.client.music.getMusicConnectionGuildIds()
-			},
+			tracking: this.getTrackingStatus(),
+			music: this.getMusicStatus(),
 			cache: this.getCacheSizes(),
-			stats: {
-				wsEvents: this.client.stats.wsEvents,
-				wsWarnings: this.client.stats.wsWarnings,
-				wsErrors: this.client.stats.wsErrors,
-				cmdProcessed: this.client.stats.cmdProcessed,
-				cmdErrors: this.client.stats.cmdErrors,
-				cmdHttpErrors: [...this.client.stats.cmdHttpErrors.entries()].map(([code, count]) => ({ code, count })),
-				httpRequestsQueued: Object.keys(req.ratelimits).reduce(
-					(acc, endpoint) => acc.concat([{ endpoint, count: req.ratelimits[endpoint]._queue.length as number }]),
-					[]
-				)
-			}
+			metrics: this.getMetrics()
 		});
 	}
 
@@ -480,6 +462,17 @@ export class RabbitMqService extends IMService {
 		}
 	}
 
+	private getTrackingStatus() {
+		return {
+			pendingGuilds: this.client.tracking.pendingGuilds.size,
+			initialPendingGuilds: this.client.tracking.initialPendingGuilds
+		};
+	}
+	private getMusicStatus() {
+		return {
+			connections: this.client.music.getMusicConnectionGuildIds()
+		};
+	}
 	private getCacheSizes() {
 		let channelCount = this.client.groupChannels.size + this.client.privateChannels.size;
 		let roleCount = 0;
@@ -505,4 +498,20 @@ export class RabbitMqService extends IMService {
 			messages: this.client.mod.getMessageCacheSize()
 		};
 	}
+	private getMetrics() {
+		const req = (this.client as any).requestHandler;
+
+		return {
+			wsEvents: this.client.stats.wsEvents,
+			wsWarnings: this.client.stats.wsWarnings,
+			wsErrors: this.client.stats.wsErrors,
+			cmdProcessed: this.client.stats.cmdProcessed,
+			cmdErrors: this.client.stats.cmdErrors,
+			cmdHttpErrors: [...this.client.stats.cmdHttpErrors.entries()].map(([code, count]) => ({ code, count })),
+			httpRequestsQueued: Object.keys(req.ratelimits).reduce(
+				(acc, endpoint) => acc.concat([{ endpoint, count: req.ratelimits[endpoint]._queue.length as number }]),
+				[]
+			)
+		};
+	}
 }