mirror of
https://git.joinsharkey.org/Sharkey/Sharkey.git
synced 2024-11-10 12:13:09 +02:00
Better logging
This commit is contained in:
parent
4275af2324
commit
3be89e9702
2 changed files with 14 additions and 12 deletions
16
src/index.ts
16
src/index.ts
|
@ -70,6 +70,8 @@ async function masterMain() {
|
||||||
//#endregion
|
//#endregion
|
||||||
}
|
}
|
||||||
|
|
||||||
|
console.log(chalk`${os.hostname()} {gray (PID: ${process.pid.toString()})}`);
|
||||||
|
|
||||||
bootLogger.info('Welcome to Misskey!');
|
bootLogger.info('Welcome to Misskey!');
|
||||||
bootLogger.info(`Misskey v${pkg.version}`, true);
|
bootLogger.info(`Misskey v${pkg.version}`, true);
|
||||||
bootLogger.info('Misskey is maintained by @syuilo, @AyaMorisawa, @mei23 and @acid-chicken.');
|
bootLogger.info('Misskey is maintained by @syuilo, @AyaMorisawa, @mei23 and @acid-chicken.');
|
||||||
|
@ -118,14 +120,14 @@ async function isPortAvailable(port: number): Promise<boolean> {
|
||||||
|
|
||||||
async function showMachine() {
|
async function showMachine() {
|
||||||
const logger = bootLogger.createSubLogger('machine');
|
const logger = bootLogger.createSubLogger('machine');
|
||||||
logger.info(`Hostname: ${os.hostname()}`);
|
logger.debug(`Hostname: ${os.hostname()}`);
|
||||||
logger.info(`Platform: ${process.platform}`);
|
logger.debug(`Platform: ${process.platform}`);
|
||||||
logger.info(`Architecture: ${process.arch}`);
|
logger.debug(`Architecture: ${process.arch}`);
|
||||||
logger.info(`CPU: ${os.cpus().length} core`);
|
logger.debug(`CPU: ${os.cpus().length} core`);
|
||||||
const mem = await sysUtils.mem();
|
const mem = await sysUtils.mem();
|
||||||
const totalmem = (mem.total / 1024 / 1024 / 1024).toFixed(1);
|
const totalmem = (mem.total / 1024 / 1024 / 1024).toFixed(1);
|
||||||
const availmem = (mem.available / 1024 / 1024 / 1024).toFixed(1);
|
const availmem = (mem.available / 1024 / 1024 / 1024).toFixed(1);
|
||||||
logger.info(`MEM: ${totalmem}GB (available: ${availmem}GB)`);
|
logger.debug(`MEM: ${totalmem}GB (available: ${availmem}GB)`);
|
||||||
}
|
}
|
||||||
|
|
||||||
function showEnvironment(): void {
|
function showEnvironment(): void {
|
||||||
|
@ -257,12 +259,12 @@ function spawnWorker(): Promise<void> {
|
||||||
|
|
||||||
// Listen new workers
|
// Listen new workers
|
||||||
cluster.on('fork', worker => {
|
cluster.on('fork', worker => {
|
||||||
clusterLog.info(`Process forked: [${worker.id}]`);
|
clusterLog.debug(`Process forked: [${worker.id}]`);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Listen online workers
|
// Listen online workers
|
||||||
cluster.on('online', worker => {
|
cluster.on('online', worker => {
|
||||||
clusterLog.succ(`Process is now online: [${worker.id}]`);
|
clusterLog.debug(`Process is now online: [${worker.id}]`);
|
||||||
});
|
});
|
||||||
|
|
||||||
// Listen for dying workers
|
// Listen for dying workers
|
||||||
|
|
|
@ -45,13 +45,13 @@ export default class Logger {
|
||||||
this.log(important ? chalk.bgGreen.white('DONE') : chalk.green('DONE'), chalk.green(message), important);
|
this.log(important ? chalk.bgGreen.white('DONE') : chalk.green('DONE'), chalk.green(message), important);
|
||||||
}
|
}
|
||||||
|
|
||||||
public info(message: string, important = false): void { // それ以外
|
public debug(message: string, important = false): void { // デバッグ用に使う(開発者にとっては必要だが利用者にとっては不要な情報)
|
||||||
this.log(chalk.blue('INFO'), message, important);
|
|
||||||
}
|
|
||||||
|
|
||||||
public debug(message: string, important = false): void { // デバッグ用に使う
|
|
||||||
if (process.env.NODE_ENV != 'production') {
|
if (process.env.NODE_ENV != 'production') {
|
||||||
this.log(chalk.gray('VERB'), chalk.gray(message), important);
|
this.log(chalk.gray('VERB'), chalk.gray(message), important);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public info(message: string, important = false): void { // それ以外
|
||||||
|
this.log(chalk.blue('INFO'), message, important);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue