Use internal logger instead of debug/console for logging

Resolve #4104
Resolve #1966
Resolve #1937

4 files changed, 17 insertions, 13 deletions

diff --git a/src/queue/index.ts b/src/queue/index.ts
index 8683bcd1df..431d4cb3e5 100644
--- a/src/queue/index.ts
+++ b/src/queue/index.ts
@@ -1,5 +1,6 @@
 import http from './processors/http';
 import { ILocalUser } from '../models/user';
+import Logger from '../misc/logger';
 
 export function createHttpJob(data: any) {
 	return http({ data }, () => {});
@@ -15,3 +16,5 @@ export function deliver(user: ILocalUser, content: any, to: any) {
 		to
 	});
 }
+
+export const queueLogger = new Logger('queue');
diff --git a/src/queue/processors/http/deliver.ts b/src/queue/processors/http/deliver.ts
index 621219fec6..d8d90a2773 100644
--- a/src/queue/processors/http/deliver.ts
+++ b/src/queue/processors/http/deliver.ts
@@ -1,6 +1,7 @@
 import * as bq from 'bee-queue';
 
 import request from '../../../remote/activitypub/request';
+import { queueLogger } from '../..';
 
 export default async (job: bq.Job, done: any): Promise<void> => {
 	try {
@@ -13,11 +14,11 @@ export default async (job: bq.Job, done: any): Promise<void> => {
 				// 何回再送しても成功することはないということなのでエラーにはしないでおく
 				done();
 			} else {
-				console.warn(`deliver failed: ${res.statusCode} ${res.statusMessage} to=${job.data.to}`);
+				queueLogger.warn(`deliver failed: ${res.statusCode} ${res.statusMessage} to=${job.data.to}`);
 				done(res.statusMessage);
 			}
 		} else {
-			console.warn(`deliver failed: ${res} to=${job.data.to}`);
+			queueLogger.warn(`deliver failed: ${res} to=${job.data.to}`);
 			done();
 		}
 	}
diff --git a/src/queue/processors/http/index.ts b/src/queue/processors/http/index.ts
index 156be42250..74ed723bd3 100644
--- a/src/queue/processors/http/index.ts
+++ b/src/queue/processors/http/index.ts
@@ -1,5 +1,6 @@
 import deliver from './deliver';
 import processInbox from './process-inbox';
+import { queueLogger } from '../..';
 
 const handlers: any = {
 	deliver,
@@ -12,7 +13,7 @@ export default (job: any, done: any) => {
 	if (handler) {
 		handler(job, done);
 	} else {
-		console.error(`Unknown job: ${job.data.type}`);
+		queueLogger.error(`Unknown job: ${job.data.type}`);
 		done();
 	}
 };
diff --git a/src/queue/processors/http/process-inbox.ts b/src/queue/processors/http/process-inbox.ts
index 32ac7aebd7..5b6d0bcd76 100644
--- a/src/queue/processors/http/process-inbox.ts
+++ b/src/queue/processors/http/process-inbox.ts
@@ -1,6 +1,4 @@
 import * as bq from 'bee-queue';
-import * as debug from 'debug';
-
 import * as httpSignature from 'http-signature';
 import parseAcct from '../../../misc/acct/parse';
 import User, { IRemoteUser } from '../../../models/user';
@@ -9,8 +7,9 @@ import { resolvePerson, updatePerson } from '../../../remote/activitypub/models/
 import { toUnicode } from 'punycode';
 import { URL } from 'url';
 import { publishApLogStream } from '../../../stream';
+import Logger from '../../../misc/logger';
 
-const log = debug('misskey:queue:inbox');
+const logger = new Logger('inbox');
 
 // ユーザーのinboxにアクティビティが届いた時の処理
 export default async (job: bq.Job, done: any): Promise<void> => {
@@ -21,7 +20,7 @@ export default async (job: bq.Job, done: any): Promise<void> => {
 	const info = Object.assign({}, activity);
 	delete info['@context'];
 	delete info['signature'];
-	log(info);
+	logger.info(info);
 	//#endregion
 
 	const keyIdLower = signature.keyId.toLowerCase();
@@ -30,7 +29,7 @@ export default async (job: bq.Job, done: any): Promise<void> => {
 	if (keyIdLower.startsWith('acct:')) {
 		const { username, host } = parseAcct(keyIdLower.slice('acct:'.length));
 		if (host === null) {
-			console.warn(`request was made by local user: @${username}`);
+			logger.warn(`request was made by local user: @${username}`);
 			done();
 			return;
 		}
@@ -39,7 +38,7 @@ export default async (job: bq.Job, done: any): Promise<void> => {
 		try {
 			ValidateActivity(activity, host);
 		} catch (e) {
-			console.warn(e.message);
+			logger.warn(e.message);
 			done();
 			return;
 		}
@@ -51,7 +50,7 @@ export default async (job: bq.Job, done: any): Promise<void> => {
 		try {
 			ValidateActivity(activity, host);
 		} catch (e) {
-			console.warn(e.message);
+			logger.warn(e.message);
 			done();
 			return;
 		}
@@ -66,9 +65,9 @@ export default async (job: bq.Job, done: any): Promise<void> => {
 	if (activity.type === 'Update') {
 		if (activity.object && activity.object.type === 'Person') {
 			if (user == null) {
-				console.warn('Update activity received, but user not registed.');
+				logger.warn('Update activity received, but user not registed.');
 			} else if (!httpSignature.verifySignature(signature, user.publicKey.publicKeyPem)) {
-				console.warn('Update activity received, but signature verification failed.');
+				logger.warn('Update activity received, but signature verification failed.');
 			} else {
 				updatePerson(activity.actor, null, activity.object);
 			}
@@ -88,7 +87,7 @@ export default async (job: bq.Job, done: any): Promise<void> => {
 	}
 
 	if (!httpSignature.verifySignature(signature, user.publicKey.publicKeyPem)) {
-		console.warn('signature verification failed');
+		logger.error('signature verification failed');
 		done();
 		return;
 	}