From 59c39eda6aee02daf35cb9be2a842f4eb155c356 Mon Sep 17 00:00:00 2001
From: Hazelnoot <acomputerdog@gmail.com>
Date: Wed, 22 Oct 2025 23:44:18 -0400
Subject: [PATCH] merge coreLogger utility with new startup services concept

---
 packages/backend/src/boot/coreLogger.ts | 15 +++++++++++++--
 packages/backend/src/boot/entry.ts      | 13 +++----------
 packages/backend/src/boot/master.ts     |  1 -
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/packages/backend/src/boot/coreLogger.ts b/packages/backend/src/boot/coreLogger.ts
index edd0a0decd..1b1a9a5ed8 100644
--- a/packages/backend/src/boot/coreLogger.ts
+++ b/packages/backend/src/boot/coreLogger.ts
@@ -1,3 +1,14 @@
-import Logger from '@/logger.js';
+/*
+ * SPDX-FileCopyrightText: hazelnoot and other Sharkey contributors
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
 
-export const coreLogger = new Logger('core', 'cyan');
+import { EnvService } from '@/global/EnvService.js';
+import { LoggerService } from '@/core/LoggerService.js';
+import { NativeTimeService } from '@/global/TimeService.js';
+
+export const envService = new EnvService();
+
+// eslint-disable-next-line no-restricted-globals
+export const loggerService = new LoggerService(console, new NativeTimeService(), envService);
+export const coreLogger = loggerService.getLogger('core', 'cyan');
diff --git a/packages/backend/src/boot/entry.ts b/packages/backend/src/boot/entry.ts
index 2e7aa95db3..002216d937 100644
--- a/packages/backend/src/boot/entry.ts
+++ b/packages/backend/src/boot/entry.ts
@@ -12,10 +12,7 @@ import { EventEmitter } from 'node:events';
 import { inspect } from 'node:util';
 import chalk from 'chalk';
 import Xev from 'xev';
-import Logger from '@/logger.js';
-import { EnvService } from '@/global/EnvService.js';
-import { LoggerService } from '@/core/LoggerService.js';
-import { NativeTimeService } from '@/global/TimeService.js';
+import { coreLogger, envService, loggerService } from '@/boot/coreLogger.js';
 import { prepEnv } from '@/boot/prepEnv.js';
 import { masterMain } from './master.js';
 import { workerMain } from './worker.js';
@@ -33,13 +30,9 @@ const ev = new Xev();
 // because not all platforms support top level await :/
 
 async function main() {
-	const envService = new EnvService();
 	const envOption = envService.options;
-
-	// eslint-disable-next-line no-restricted-globals
-	const loggerService = new LoggerService(console, new NativeTimeService(), envService);
-	const logger = loggerService.getLogger('core', 'cyan');
-	const clusterLogger = logger.createSubLogger('cluster', 'orange');
+	const clusterLogger = coreLogger.createSubLogger('cluster', 'orange');
+	const logger = coreLogger;
 
 	//#region Events
 	// Listen new workers
diff --git a/packages/backend/src/boot/master.ts b/packages/backend/src/boot/master.ts
index c603c7b6fe..017778b3c1 100644
--- a/packages/backend/src/boot/master.ts
+++ b/packages/backend/src/boot/master.ts
@@ -21,7 +21,6 @@ import type { EnvService } from '@/global/EnvService.js';
 import type { EnvOption } from '@/env.js';
 import { renderInlineError } from '@/misc/render-inline-error.js';
 import { showMachineInfo } from '@/misc/show-machine-info.js';
-import { coreLogger } from '@/boot/coreLogger.js';
 import { jobQueue, server } from './common.js';
 
 const _filename = fileURLToPath(import.meta.url);