summary refs log tree commit diff
path: root/bundle/src
diff options
context:
space:
mode:
authorMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2022-04-19 20:09:22 +1000
committerMadeline <46743919+MaddyUnderStars@users.noreply.github.com>2022-04-19 20:09:22 +1000
commitb941560d484024d764521ab9ca42f4bb900b00be (patch)
treef130ec9ef94665f4e38056eb958a1b0709438efc /bundle/src
parentfixed migration? (diff)
parentTry catch cpu log (diff)
downloadserver-b941560d484024d764521ab9ca42f4bb900b00be.tar.xz
Merge branch 'master' into slowcord
Diffstat (limited to 'bundle/src')
-rw-r--r--bundle/src/start.ts7
-rw-r--r--bundle/src/stats.ts8
2 files changed, 13 insertions, 2 deletions
diff --git a/bundle/src/start.ts b/bundle/src/start.ts
index 7660b296..de3b5848 100644
--- a/bundle/src/start.ts
+++ b/bundle/src/start.ts
@@ -9,7 +9,12 @@ config();
 import { execSync } from "child_process";
 
 // TODO: add socket event transmission
-let cores = Number(process.env.THREADS) || os.cpus().length;
+var cores = 1;
+try {
+	cores = Number(process.env.THREADS) || os.cpus().length;
+} catch {
+	console.log("[API] Failed to get thread count! Using 1...")
+}
 
 if (cluster.isMaster) {
 	function getCommitOrFail() {
diff --git a/bundle/src/stats.ts b/bundle/src/stats.ts
index 3c5163c3..0234e0b4 100644
--- a/bundle/src/stats.ts
+++ b/bundle/src/stats.ts
@@ -4,7 +4,13 @@ import { red } from "picocolors";
 
 export function initStats() {
 	console.log(`[Path] running in ${__dirname}`);
-	console.log(`[CPU] ${osu.cpu.model()} Cores x${osu.cpu.count()}`);
+	try {
+		console.log(`[CPU] ${osu.cpu.model()} Cores x${osu.cpu.count()}`);
+	}
+	catch {
+		console.log('[CPU] Failed to get cpu model!')
+	}
+	
 	console.log(`[System] ${os.platform()} ${os.arch()}`);
 	console.log(`[Process] running with PID: ${process.pid}`);
 	if (process.getuid && process.getuid() === 0) {