From 333f5b159335b0dc2bd82a85331c9f15e741068e Mon Sep 17 00:00:00 2001 From: chenos Date: Tue, 1 Apr 2025 22:29:27 +0800 Subject: [PATCH] chore: refine and enhance log messages. --- packages/core/cli/src/commands/pkg.js | 18 ++++++++++-------- packages/core/server/src/gateway/index.ts | 12 ++++++------ .../server/src/gateway/ipc-socket-server.ts | 3 ++- 3 files changed, 18 insertions(+), 15 deletions(-) diff --git a/packages/core/cli/src/commands/pkg.js b/packages/core/cli/src/commands/pkg.js index a0a4e883dd..364559a7a7 100644 --- a/packages/core/cli/src/commands/pkg.js +++ b/packages/core/cli/src/commands/pkg.js @@ -15,6 +15,7 @@ const tar = require('tar'); const path = require('path'); const { createStoragePluginsSymlink } = require('@nocobase/utils/plugin-symlink'); const chalk = require('chalk'); +const { logger } = require('@nocobase/logger'); class Package { data; @@ -77,7 +78,7 @@ class Package { } if (!this.data.versions[version]) { - console.log(chalk.redBright(`Download failed: ${this.packageName}@${version} package does not exist`)); + logger.error(`Download failed: ${this.packageName}@${version} package does not exist`); } return [version, this.data.versions[version].dist.tarball]; @@ -108,7 +109,7 @@ class Package { async download(options = {}) { if (await this.isDevPackage()) { - console.log(chalk.yellowBright(`Skipped: ${this.packageName} is dev package`)); + logger.warn(`Skipped: ${this.packageName} is dev package`); return; } if (await this.isDownloaded(options.version)) { @@ -116,7 +117,7 @@ class Package { } await this.getInfo(); if (!this.data) { - console.log(chalk.redBright(`Download failed: ${this.packageName} package does not exist`)); + logger.error(`Download failed: ${this.packageName} package does not exist`); return; } try { @@ -140,9 +141,9 @@ class Package { .on('finish', resolve) .on('error', reject); }); - console.log(chalk.greenBright(`Downloaded: ${this.packageName}@${version}`)); + logger.info(`Downloaded: ${this.packageName}@${version}`); } catch (error) { - console.log(chalk.redBright(`Download failed: ${this.packageName}`)); + logger.error(`Download failed: ${this.packageName}`); } } } @@ -174,7 +175,8 @@ class PackageManager { }); this.token = res1.data.token; } catch (error) { - console.error(chalk.redBright(`Login failed: ${this.baseURL}`)); + logger.error(`Login failed: ${this.baseURL}`); + logger.error(error); } } @@ -211,8 +213,8 @@ class PackageManager { const dir = path.resolve(process.env.PLUGIN_STORAGE_PATH, packageName); const r = await fs.exists(dir); if (r) { - console.log(chalk.yellowBright(`Removed: ${packageName}`)); await fs.rm(dir, { force: true, recursive: true }); + logger.info(`Removed: ${packageName}`); } } @@ -260,6 +262,6 @@ module.exports = (cli) => { await createStoragePluginsSymlink(); }); pkg.command('export-all').action(async () => { - console.log('Todo...'); + logger.info('Todo...'); }); }; diff --git a/packages/core/server/src/gateway/index.ts b/packages/core/server/src/gateway/index.ts index 821b7b4925..2426a9e394 100644 --- a/packages/core/server/src/gateway/index.ts +++ b/packages/core/server/src/gateway/index.ts @@ -7,7 +7,7 @@ * For more information, please refer to: https://www.nocobase.com/agreement. */ -import { createSystemLogger, getLoggerFilePath, SystemLogger } from '@nocobase/logger'; +import { createSystemLogger, getLoggerFilePath, logger, SystemLogger } from '@nocobase/logger'; import { Registry, Toposort, ToposortOptions, uid } from '@nocobase/utils'; import { createStoragePluginsSymlink } from '@nocobase/utils/plugin-symlink'; import { Command } from 'commander'; @@ -17,7 +17,9 @@ import { EventEmitter } from 'events'; import fs from 'fs'; import http, { IncomingMessage, ServerResponse } from 'http'; import compose from 'koa-compose'; +import process from 'node:process'; import { promisify } from 'node:util'; +import { isMainThread, workerData } from 'node:worker_threads'; import { isAbsolute, resolve } from 'path'; import qs from 'qs'; import handler from 'serve-handler'; @@ -29,8 +31,6 @@ import { applyErrorWithArgs, getErrorWithCode } from './errors'; import { IPCSocketClient } from './ipc-socket-client'; import { IPCSocketServer } from './ipc-socket-server'; import { WSServer } from './ws-server'; -import { isMainThread, workerData } from 'node:worker_threads'; -import process from 'node:process'; const compress = promisify(compression()); @@ -244,7 +244,7 @@ export class Gateway extends EventEmitter { try { handleApp = await this.getRequestHandleAppName(req as IncomingRequest); } catch (error) { - console.log(error); + logger.error(error); this.responseErrorWithCode('APP_INITIALIZING', res, { appName: handleApp }); return; } @@ -437,7 +437,7 @@ export class Gateway extends EventEmitter { } if (this.port === null) { - console.log('gateway port is not set, http server will not start'); + logger.error('gateway port is not set, http server will not start'); return; } @@ -458,7 +458,7 @@ export class Gateway extends EventEmitter { }); this.server.listen(this.port, this.host, () => { - console.log(`Gateway HTTP Server running at http://${this.host}:${this.port}/`); + logger.info(`Gateway HTTP Server running at http://${this.host}:${this.port}/`); if (options?.callback) { options.callback(this.server); } diff --git a/packages/core/server/src/gateway/ipc-socket-server.ts b/packages/core/server/src/gateway/ipc-socket-server.ts index 3aad5367e9..5cee484309 100644 --- a/packages/core/server/src/gateway/ipc-socket-server.ts +++ b/packages/core/server/src/gateway/ipc-socket-server.ts @@ -7,6 +7,7 @@ * For more information, please refer to: https://www.nocobase.com/agreement. */ +import { logger } from '@nocobase/logger'; import { randomUUID } from 'crypto'; import fs from 'fs'; import net from 'net'; @@ -75,7 +76,7 @@ export class IPCSocketServer { }); socketServer.listen(xpipe.eq(socketPath), () => { - console.log(`Gateway IPC Server running at ${socketPath}`); + logger.info(`Gateway IPC Server running at ${socketPath}`); }); return new IPCSocketServer(socketServer);