Use internal logger instead of debug/console for logging

Resolve #4104
Resolve #1966
Resolve #1937

8 files changed, 19 insertions, 9 deletions

diff --git a/src/server/api/endpoints/drive/files/create.ts b/src/server/api/endpoints/drive/files/create.ts
index ce93202991..47a407eff5 100644
--- a/src/server/api/endpoints/drive/files/create.ts
+++ b/src/server/api/endpoints/drive/files/create.ts
@@ -3,6 +3,7 @@ import $ from 'cafy'; import ID, { transform } from '../../../../../misc/cafy-id
 import { validateFileName, pack } from '../../../../../models/drive-file';
 import create from '../../../../../services/drive/add-file';
 import define from '../../../define';
+import { apiLogger } from '../../../logger';
 
 export const meta = {
 	desc: {
@@ -76,7 +77,7 @@ export default define(meta, (ps, user, app, file, cleanup) => new Promise(async
 
 		res(pack(driveFile, { self: true }));
 	} catch (e) {
-		console.error(e);
+		apiLogger.error(e);
 
 		cleanup();
 
diff --git a/src/server/api/endpoints/i/update_email.ts b/src/server/api/endpoints/i/update_email.ts
index aeaa3d39e4..eeac460796 100644
--- a/src/server/api/endpoints/i/update_email.ts
+++ b/src/server/api/endpoints/i/update_email.ts
@@ -8,6 +8,7 @@ import rndstr from 'rndstr';
 import config from '../../../../config';
 import * as ms from 'ms';
 import * as bcrypt from 'bcryptjs';
+import { apiLogger } from '../../logger';
 
 export const meta = {
 	requireCredential: true,
@@ -91,10 +92,11 @@ export default define(meta, (ps, user) => new Promise(async (res, rej) => {
 			text: `To verify email, please click this link: ${link}`
 		}, (error, info) => {
 			if (error) {
-				return console.error(error);
+				apiLogger.error(error);
+				return;
 			}
 
-			console.log('Message sent: %s', info.messageId);
+			apiLogger.info('Message sent: %s', info.messageId);
 		});
 	}
 }));
diff --git a/src/server/api/endpoints/notes/search.ts b/src/server/api/endpoints/notes/search.ts
index e107ca4e15..652dc6b31d 100644
--- a/src/server/api/endpoints/notes/search.ts
+++ b/src/server/api/endpoints/notes/search.ts
@@ -4,6 +4,7 @@ import Note from '../../../../models/note';
 import { packMany } from '../../../../models/note';
 import es from '../../../../db/elasticsearch';
 import define from '../../define';
+import { apiLogger } from '../../logger';
 
 export const meta = {
 	desc: {
@@ -52,7 +53,7 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 		}
 	}, async (error, response) => {
 		if (error) {
-			console.error(error);
+			apiLogger.error(error);
 			return res(500);
 		}
 
diff --git a/src/server/api/endpoints/users/recommendation.ts b/src/server/api/endpoints/users/recommendation.ts
index 0d7e57b529..e3a03888b6 100644
--- a/src/server/api/endpoints/users/recommendation.ts
+++ b/src/server/api/endpoints/users/recommendation.ts
@@ -8,6 +8,7 @@ import define from '../../define';
 import fetchMeta from '../../../../misc/fetch-meta';
 import resolveUser from '../../../../remote/resolve-user';
 import { getHideUserIds } from '../../common/get-hide-users';
+import { apiLogger } from '../../logger';
 
 export const meta = {
 	desc: {
@@ -102,7 +103,7 @@ async function convertUsers(src: IRecommendUser[], me: ILocalUser) {
 	const packed = await Promise.all(src.map(async x => {
 		const user = await resolveUser(x.username, x.host)
 			.catch(() => {
-				console.warn(`Can't resolve ${x.username}@${x.host}`);
+				apiLogger.warn(`Can't resolve ${x.username}@${x.host}`);
 				return null;
 			});
 
diff --git a/src/server/api/endpoints/users/show.ts b/src/server/api/endpoints/users/show.ts
index fd26554709..83897dd45c 100644
--- a/src/server/api/endpoints/users/show.ts
+++ b/src/server/api/endpoints/users/show.ts
@@ -2,6 +2,7 @@ import $ from 'cafy'; import ID, { transform, transformMany } from '../../../../
 import User, { pack, isRemoteUser } from '../../../../models/user';
 import resolveRemoteUser from '../../../../remote/resolve-user';
 import define from '../../define';
+import { apiLogger } from '../../logger';
 
 const cursorOption = { fields: { data: false } };
 
@@ -59,7 +60,7 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 			try {
 				user = await resolveRemoteUser(ps.username, ps.host, cursorOption);
 			} catch (e) {
-				console.warn(`failed to resolve remote user: ${e}`);
+				apiLogger.warn(`failed to resolve remote user: ${e}`);
 				return rej('failed to resolve remote user');
 			}
 		} else {
diff --git a/src/server/api/logger.ts b/src/server/api/logger.ts
new file mode 100644
index 0000000000..334a696331
--- /dev/null
+++ b/src/server/api/logger.ts
@@ -0,0 +1,3 @@
+import Logger from "../../misc/logger";
+
+export const apiLogger = new Logger('api');
diff --git a/src/server/file/send-drive-file.ts b/src/server/file/send-drive-file.ts
index 1cfdd1c4d5..691d3bf848 100644
--- a/src/server/file/send-drive-file.ts
+++ b/src/server/file/send-drive-file.ts
@@ -4,11 +4,12 @@ import * as mongodb from 'mongodb';
 import DriveFile, { getDriveFileBucket } from '../../models/drive-file';
 import DriveFileThumbnail, { getDriveFileThumbnailBucket } from '../../models/drive-file-thumbnail';
 import DriveFileWebpublic, { getDriveFileWebpublicBucket } from '../../models/drive-file-webpublic';
+import { serverLogger } from '..';
 
 const assets = `${__dirname}/../../server/file/assets/`;
 
 const commonReadableHandlerGenerator = (ctx: Koa.BaseContext) => (e: Error): void => {
-	console.error(e);
+	serverLogger.error(e);
 	ctx.status = 500;
 };
 
diff --git a/src/server/index.ts b/src/server/index.ts
index 012f080f98..57f1326f2f 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -24,7 +24,7 @@ import { sum } from '../prelude/array';
 import User from '../models/user';
 import Logger from '../misc/logger';
 
-const logger = new Logger('server', 'gray');
+export const serverLogger = new Logger('server', 'gray');
 
 // Init app
 const app = new Koa();
@@ -33,7 +33,7 @@ app.proxy = true;
 if (!['production', 'test'].includes(process.env.NODE_ENV)) {
 	// Logger
 	app.use(koaLogger(str => {
-		logger.info(str);
+		serverLogger.info(str);
 	}));
 
 	// Delay