From d3334666eca66c7072ae4a8a47278bdb79664abc Mon Sep 17 00:00:00 2001 From: undefined Date: Sun, 23 Aug 2026 04:03:51 +0000 Subject: [PATCH] core: use cordis builtin logger --- packages/hydrooj/package.json | 1 - packages/hydrooj/src/loader.ts | 21 ++++++--------------- 2 files changed, 6 insertions(+), 16 deletions(-) diff --git a/packages/hydrooj/package.json b/packages/hydrooj/package.json index c287ed889..f9d5601ed 100644 --- a/packages/hydrooj/package.json +++ b/packages/hydrooj/package.json @@ -17,7 +17,6 @@ "@aws-sdk/s3-presigned-post": "3.1048.0", "@aws-sdk/s3-request-presigner": "3.1048.0", "@babel/code-frame": "^8.0.0", - "@cordisjs/plugin-logger": "^1.0.2", "@cordisjs/plugin-timer": "1.1.2", "@hydrooj/common": "workspace:^", "@hydrooj/framework": "workspace:^", diff --git a/packages/hydrooj/src/loader.ts b/packages/hydrooj/src/loader.ts index 091427a33..9f46554e9 100644 --- a/packages/hydrooj/src/loader.ts +++ b/packages/hydrooj/src/loader.ts @@ -18,7 +18,6 @@ import { sleep, unwrapExports } from './utils'; import { PRIV } from './model/builtin'; import { getAddons } from './options'; import { TimerService } from '@cordisjs/plugin-timer'; -import LoggerService from '@cordisjs/plugin-logger'; import Schema from 'schemastery'; import { isEqual } from 'lodash'; @@ -52,7 +51,7 @@ export class Loader extends Service { private schemaCache = new WeakMap, Record>>(); // public warnings: Record = Object.create(null); - static inject = ['setting', 'timer', 'i18n', 'logger']; + static inject = ['setting', 'timer', 'i18n']; constructor(ctx: Context) { super(ctx, 'loader'); @@ -163,26 +162,18 @@ export class Loader extends Service { } } +app.logger.exporter({ + levels: { default: process.env.DEV ? 3 : 2 }, + export: ({ name, type, args }) => (new Logger(name)[type] as (...args: any[]) => void)(...args), +}); app.plugin(ApiMixin); app.plugin(TimerService); -app.plugin(LoggerService, { - console: { - showDiff: false, - showTime: 'dd hh:mm:ss', - label: { - align: 'right', - width: 9, - margin: 1, - }, - levels: { default: process.env.DEV ? 3 : 2 }, - }, -}); app.plugin(I18nService); app.plugin(Loader); async function preload() { global.app = await new Promise((resolve) => { - app.inject(['timer', 'i18n', 'logger', '$api'], (c) => { + app.inject(['timer', 'i18n', '$api'], (c) => { c.inject({ domain: { required: false } }, resolve); }); });