fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-05 13:39:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: refine and enhance log messages.

Browse Source
This commit is contained in:
chenos 2025-04-01 22:29:27 +08:00
parent 33bfdf6cd7
commit 333f5b1593
3 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/core/cli/src/commands/pkg.js
View File

@ -15,6 +15,7 @@ const tar = require('tar');
const path = require('path'); const path = require('path');
const { createStoragePluginsSymlink } = require('@nocobase/utils/plugin-symlink'); const { createStoragePluginsSymlink } = require('@nocobase/utils/plugin-symlink');
const chalk = require('chalk'); const chalk = require('chalk');
const { logger } = require('@nocobase/logger');
class Package { class Package {
data; data;
@ -77,7 +78,7 @@ class Package {
} }
if (!this.data.versions[version]) { 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]; return [version, this.data.versions[version].dist.tarball];
@ -108,7 +109,7 @@ class Package {
async download(options = {}) { async download(options = {}) {
if (await this.isDevPackage()) { if (await this.isDevPackage()) {
console.log(chalk.yellowBright(`Skipped: ${this.packageName} is dev package`)); logger.warn(`Skipped: ${this.packageName} is dev package`);
return; return;
} }
if (await this.isDownloaded(options.version)) { if (await this.isDownloaded(options.version)) {
@ -116,7 +117,7 @@ class Package {
} }
await this.getInfo(); await this.getInfo();
if (!this.data) { 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; return;
} }
try { try {
@ -140,9 +141,9 @@ class Package {
.on('finish', resolve) .on('finish', resolve)
.on('error', reject); .on('error', reject);
}); });
console.log(chalk.greenBright(`Downloaded: ${this.packageName}@${version}`)); logger.info(`Downloaded: ${this.packageName}@${version}`);
} catch (error) { } 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; this.token = res1.data.token;
} catch (error) { } 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 dir = path.resolve(process.env.PLUGIN_STORAGE_PATH, packageName);
const r = await fs.exists(dir); const r = await fs.exists(dir);
if (r) { if (r) {
console.log(chalk.yellowBright(`Removed: ${packageName}`));
await fs.rm(dir, { force: true, recursive: true }); await fs.rm(dir, { force: true, recursive: true });
logger.info(`Removed: ${packageName}`);
} }
} }
@ -260,6 +262,6 @@ module.exports = (cli) => {
await createStoragePluginsSymlink(); await createStoragePluginsSymlink();
}); });
pkg.command('export-all').action(async () => { pkg.command('export-all').action(async () => {
console.log('Todo...'); logger.info('Todo...');
}); });
}; };

12
packages/core/server/src/gateway/index.ts
View File

@ -7,7 +7,7 @@
* For more information, please refer to: https://www.nocobase.com/agreement. * 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 { Registry, Toposort, ToposortOptions, uid } from '@nocobase/utils';
import { createStoragePluginsSymlink } from '@nocobase/utils/plugin-symlink'; import { createStoragePluginsSymlink } from '@nocobase/utils/plugin-symlink';
import { Command } from 'commander'; import { Command } from 'commander';
@ -17,7 +17,9 @@ import { EventEmitter } from 'events';
import fs from 'fs'; import fs from 'fs';
import http, { IncomingMessage, ServerResponse } from 'http'; import http, { IncomingMessage, ServerResponse } from 'http';
import compose from 'koa-compose'; import compose from 'koa-compose';
import process from 'node:process';
import { promisify } from 'node:util'; import { promisify } from 'node:util';
import { isMainThread, workerData } from 'node:worker_threads';
import { isAbsolute, resolve } from 'path'; import { isAbsolute, resolve } from 'path';
import qs from 'qs'; import qs from 'qs';
import handler from 'serve-handler'; import handler from 'serve-handler';
@ -29,8 +31,6 @@ import { applyErrorWithArgs, getErrorWithCode } from './errors';
import { IPCSocketClient } from './ipc-socket-client'; import { IPCSocketClient } from './ipc-socket-client';
import { IPCSocketServer } from './ipc-socket-server'; import { IPCSocketServer } from './ipc-socket-server';
import { WSServer } from './ws-server'; import { WSServer } from './ws-server';
import { isMainThread, workerData } from 'node:worker_threads';
import process from 'node:process';
const compress = promisify(compression()); const compress = promisify(compression());
@ -244,7 +244,7 @@ export class Gateway extends EventEmitter {
try { try {
handleApp = await this.getRequestHandleAppName(req as IncomingRequest); handleApp = await this.getRequestHandleAppName(req as IncomingRequest);
} catch (error) { } catch (error) {
console.log(error); logger.error(error);
this.responseErrorWithCode('APP_INITIALIZING', res, { appName: handleApp }); this.responseErrorWithCode('APP_INITIALIZING', res, { appName: handleApp });
return; return;
} }
@ -437,7 +437,7 @@ export class Gateway extends EventEmitter {
} }
if (this.port === null) { 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; return;
} }
@ -458,7 +458,7 @@ export class Gateway extends EventEmitter {
}); });
this.server.listen(this.port, this.host, () => { 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) { if (options?.callback) {
options.callback(this.server); options.callback(this.server);
} }

3
packages/core/server/src/gateway/ipc-socket-server.ts
View File

@ -7,6 +7,7 @@
* For more information, please refer to: https://www.nocobase.com/agreement. * For more information, please refer to: https://www.nocobase.com/agreement.
*/ */
import { logger } from '@nocobase/logger';
import { randomUUID } from 'crypto'; import { randomUUID } from 'crypto';
import fs from 'fs'; import fs from 'fs';
import net from 'net'; import net from 'net';
@ -75,7 +76,7 @@ export class IPCSocketServer {
}); });
socketServer.listen(xpipe.eq(socketPath), () => { 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); return new IPCSocketServer(socketServer);