Use internal logger instead of debug/console for logging

Resolve #4104
Resolve #1966
Resolve #1937

2 files changed, 8 insertions, 10 deletions

diff --git a/src/remote/activitypub/kernel/announce/index.ts b/src/remote/activitypub/kernel/announce/index.ts
index 612b5dee84..80875b90da 100644
--- a/src/remote/activitypub/kernel/announce/index.ts
+++ b/src/remote/activitypub/kernel/announce/index.ts
@@ -1,16 +1,15 @@
-import * as debug from 'debug';
-
 import Resolver from '../../resolver';
 import { IRemoteUser } from '../../../../models/user';
 import announceNote from './note';
 import { IAnnounce, INote } from '../../type';
+import { apLogger } from '../../logger';
 
-const log = debug('misskey:activitypub');
+const logger = apLogger;
 
 export default async (actor: IRemoteUser, activity: IAnnounce): Promise<void> => {
 	const uri = activity.id || activity;
 
-	log(`Announce: ${uri}`);
+	logger.info(`Announce: ${uri}`);
 
 	const resolver = new Resolver();
 
@@ -19,7 +18,7 @@ export default async (actor: IRemoteUser, activity: IAnnounce): Promise<void> =>
 	try {
 		object = await resolver.resolve(activity.object);
 	} catch (e) {
-		log(`Resolution failed: ${e}`);
+		logger.error(`Resolution failed: ${e}`);
 		throw e;
 	}
 
@@ -29,7 +28,7 @@ export default async (actor: IRemoteUser, activity: IAnnounce): Promise<void> =>
 		break;
 
 	default:
-		console.warn(`Unknown announce type: ${object.type}`);
+		logger.warn(`Unknown announce type: ${object.type}`);
 		break;
 	}
 };
diff --git a/src/remote/activitypub/kernel/announce/note.ts b/src/remote/activitypub/kernel/announce/note.ts
index 5eaeaf7918..128ca6da81 100644
--- a/src/remote/activitypub/kernel/announce/note.ts
+++ b/src/remote/activitypub/kernel/announce/note.ts
@@ -1,13 +1,12 @@
-import * as debug from 'debug';
-
 import Resolver from '../../resolver';
 import post from '../../../../services/note/create';
 import { IRemoteUser, IUser } from '../../../../models/user';
 import { IAnnounce, INote } from '../../type';
 import { fetchNote, resolveNote } from '../../models/note';
 import { resolvePerson } from '../../models/person';
+import { apLogger } from '../../logger';
 
-const log = debug('misskey:activitypub');
+const logger = apLogger;
 
 /**
  * アナウンスアクティビティを捌きます
@@ -32,7 +31,7 @@ export default async function(resolver: Resolver, actor: IRemoteUser, activity:
 
 	const renote = await resolveNote(note);
 
-	log(`Creating the (Re)Note: ${uri}`);
+	logger.info(`Creating the (Re)Note: ${uri}`);
 
 	//#region Visibility
 	const visibility = getVisibility(activity.to, activity.cc, actor);