From 0868c3517f8c2dda5527c8863ce5144fffde0eb5 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 3 Feb 2019 18:16:57 +0900
Subject: Use internal logger instead of debug/console for logging

Resolve #4104
Resolve #1966
Resolve #1937
---
 src/remote/activitypub/kernel/undo/block.ts | 6 +++---
 src/remote/activitypub/kernel/undo/index.ts | 9 ++++-----
 2 files changed, 7 insertions(+), 8 deletions(-)

(limited to 'src/remote/activitypub/kernel/undo')

diff --git a/src/remote/activitypub/kernel/undo/block.ts b/src/remote/activitypub/kernel/undo/block.ts
index b735f114d0..4a22ac7924 100644
--- a/src/remote/activitypub/kernel/undo/block.ts
+++ b/src/remote/activitypub/kernel/undo/block.ts
@@ -1,18 +1,18 @@
 import * as mongo from 'mongodb';
 import User, { IRemoteUser } from '../../../../models/user';
 import config from '../../../../config';
-import * as debug from 'debug';
 import { IBlock } from '../../type';
 import unblock from '../../../../services/blocking/delete';
+import { apLogger } from '../../logger';
 
-const log = debug('misskey:activitypub');
+const logger = apLogger;
 
 export default async (actor: IRemoteUser, activity: IBlock): Promise<void> => {
 	const id = typeof activity.object == 'string' ? activity.object : activity.object.id;
 
 	const uri = activity.id || activity;
 
-	log(`UnBlock: ${uri}`);
+	logger.info(`UnBlock: ${uri}`);
 
 	if (!id.startsWith(config.url + '/')) {
 		return null;
diff --git a/src/remote/activitypub/kernel/undo/index.ts b/src/remote/activitypub/kernel/undo/index.ts
index 471988f052..80b44fae04 100644
--- a/src/remote/activitypub/kernel/undo/index.ts
+++ b/src/remote/activitypub/kernel/undo/index.ts
@@ -1,13 +1,12 @@
-import * as debug from 'debug';
-
 import { IRemoteUser } from '../../../../models/user';
 import { IUndo, IFollow, IBlock, ILike } from '../../type';
 import unfollow from './follow';
 import unblock from './block';
 import undoLike from './like';
 import Resolver from '../../resolver';
+import { apLogger } from '../../logger';
 
-const log = debug('misskey:activitypub');
+const logger = apLogger;
 
 export default async (actor: IRemoteUser, activity: IUndo): Promise<void> => {
 	if ('actor' in activity && actor.uri !== activity.actor) {
@@ -16,7 +15,7 @@ export default async (actor: IRemoteUser, activity: IUndo): Promise<void> => {
 
 	const uri = activity.id || activity;
 
-	log(`Undo: ${uri}`);
+	logger.info(`Undo: ${uri}`);
 
 	const resolver = new Resolver();
 
@@ -25,7 +24,7 @@ export default async (actor: IRemoteUser, activity: IUndo): Promise<void> => {
 	try {
 		object = await resolver.resolve(activity.object);
 	} catch (e) {
-		log(`Resolution failed: ${e}`);
+		logger.error(`Resolution failed: ${e}`);
 		throw e;
 	}
 
-- 
cgit v1.2.3-freya