misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

merge coreLogger utility with new startup services concept

Browse source
This commit is contained in:
Hazelnoot 2025-10-22 23:44:18 -04:00
parent 7f4353fcf1
commit 59c39eda6a
3 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

15
packages/backend/src/boot/coreLogger.ts
View file

@ -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');

13
packages/backend/src/boot/entry.ts
View file

@ -12,10 +12,7 @@ import { EventEmitter } from 'node:events';
import { inspect } from 'node:util'; import { inspect } from 'node:util';
import chalk from 'chalk'; import chalk from 'chalk';
import Xev from 'xev'; import Xev from 'xev';
import Logger from '@/logger.js'; import { coreLogger, envService, loggerService } from '@/boot/coreLogger.js';
import { EnvService } from '@/global/EnvService.js';
import { LoggerService } from '@/core/LoggerService.js';
import { NativeTimeService } from '@/global/TimeService.js';
import { prepEnv } from '@/boot/prepEnv.js'; import { prepEnv } from '@/boot/prepEnv.js';
import { masterMain } from './master.js'; import { masterMain } from './master.js';
import { workerMain } from './worker.js'; import { workerMain } from './worker.js';
@ -33,13 +30,9 @@ const ev = new Xev();
// because not all platforms support top level await :/ // because not all platforms support top level await :/
async function main() { async function main() {
const envService = new EnvService();
const envOption = envService.options; const envOption = envService.options;
const clusterLogger = coreLogger.createSubLogger('cluster', 'orange');
// eslint-disable-next-line no-restricted-globals const logger = coreLogger;
const loggerService = new LoggerService(console, new NativeTimeService(), envService);
const logger = loggerService.getLogger('core', 'cyan');
const clusterLogger = logger.createSubLogger('cluster', 'orange');
//#region Events //#region Events
// Listen new workers // Listen new workers

1
packages/backend/src/boot/master.ts
View file

@ -21,7 +21,6 @@ import type { EnvService } from '@/global/EnvService.js';
import type { EnvOption } from '@/env.js'; import type { EnvOption } from '@/env.js';
import { renderInlineError } from '@/misc/render-inline-error.js'; import { renderInlineError } from '@/misc/render-inline-error.js';
import { showMachineInfo } from '@/misc/show-machine-info.js'; import { showMachineInfo } from '@/misc/show-machine-info.js';
import { coreLogger } from '@/boot/coreLogger.js';
import { jobQueue, server } from './common.js'; import { jobQueue, server } from './common.js';
const _filename = fileURLToPath(import.meta.url); const _filename = fileURLToPath(import.meta.url);