HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions

Refactoring of logger

Browse source
This commit is contained in:
syuilo 2019-02-03 01:24:59 +09:00
parent 80aa45372a
commit 05baa89508
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
2 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/index.ts
View file

@ -26,8 +26,8 @@ import { lessThan } from './prelude/array';
import * as pkg from '../package.json'; import * as pkg from '../package.json';
const logger = new Logger('core'); const logger = new Logger('core');
const bootLogger = new Logger('boot', logger); const bootLogger = logger.createSubLogger('boot');
const clusterLog = new Logger('cluster', logger); const clusterLog = logger.createSubLogger('cluster');
const ev = new Xev(); const ev = new Xev();
if (process.env.NODE_ENV != 'production' && process.env.DEBUG == null) { if (process.env.NODE_ENV != 'production' && process.env.DEBUG == null) {
@ -116,7 +116,7 @@ async function isPortAvailable(port: number): Promise<boolean> {
} }
async function showMachine() { async function showMachine() {
const logger = new Logger('Machine', bootLogger); const logger = bootLogger.createSubLogger('machine');
logger.info(`Hostname: ${os.hostname()}`); logger.info(`Hostname: ${os.hostname()}`);
logger.info(`Platform: ${process.platform}`); logger.info(`Platform: ${process.platform}`);
logger.info(`Architecture: ${process.arch}`); logger.info(`Architecture: ${process.arch}`);
@ -129,7 +129,7 @@ async function showMachine() {
function showEnvironment(): void { function showEnvironment(): void {
const env = process.env.NODE_ENV; const env = process.env.NODE_ENV;
const logger = new Logger('Env', bootLogger); const logger = bootLogger.createSubLogger('env');
logger.info(typeof env == 'undefined' ? 'NODE_ENV is not set' : `NODE_ENV: ${env}`); logger.info(typeof env == 'undefined' ? 'NODE_ENV is not set' : `NODE_ENV: ${env}`);
if (env !== 'production') { if (env !== 'production') {
@ -147,7 +147,7 @@ async function init(): Promise<Config> {
bootLogger.info('Welcome to Misskey!'); bootLogger.info('Welcome to Misskey!');
bootLogger.info(`<<< Misskey v${pkg.version} >>>`); bootLogger.info(`<<< Misskey v${pkg.version} >>>`);
const nodejsLogger = new Logger('Nodejs', bootLogger); const nodejsLogger = bootLogger.createSubLogger('nodejs');
nodejsLogger.info(`Version ${runningNodejsVersion.join('.')}`); nodejsLogger.info(`Version ${runningNodejsVersion.join('.')}`);
@ -159,7 +159,7 @@ async function init(): Promise<Config> {
await showMachine(); await showMachine();
showEnvironment(); showEnvironment();
const configLogger = new Logger('Config', bootLogger); const configLogger = bootLogger.createSubLogger('config');
let config; let config;
try { try {
@ -202,7 +202,7 @@ async function init(): Promise<Config> {
const requiredMongoDBVersion = [3, 6]; const requiredMongoDBVersion = [3, 6];
function checkMongoDB(config: Config) { function checkMongoDB(config: Config) {
const mongoDBLogger = new Logger('MongoDB', bootLogger); const mongoDBLogger = bootLogger.createSubLogger('db');
const u = config.mongodb.user ? encodeURIComponent(config.mongodb.user) : null; const u = config.mongodb.user ? encodeURIComponent(config.mongodb.user) : null;
const p = config.mongodb.pass ? encodeURIComponent(config.mongodb.pass) : null; const p = config.mongodb.pass ? encodeURIComponent(config.mongodb.pass) : null;
const uri = `mongodb://${u && p ? `${u}:****@` : ''}${config.mongodb.host}:${config.mongodb.port}/${config.mongodb.db}`; const uri = `mongodb://${u && p ? `${u}:****@` : ''}${config.mongodb.host}:${config.mongodb.port}/${config.mongodb.db}`;

9
src/misc/logger.ts
View file

@ -5,9 +5,14 @@ export default class Logger {
private domain: string; private domain: string;
private parentLogger: Logger; private parentLogger: Logger;
constructor(domain: string, parentLogger?: Logger) { constructor(domain: string) {
this.domain = domain; this.domain = domain;
this.parentLogger = parentLogger; }
public createSubLogger(domain: string): Logger {
const logger = new Logger(domain);
logger.parentLogger = this;
return logger;
} }
public log(level: string, message: string, important = false): void { public log(level: string, message: string, important = false): void {