Use internal logger instead of debug/console for logging
Resolve #4104 Resolve #1966 Resolve #1937
This commit is contained in:
@ -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();
|
||||
|
||||
|
@ -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);
|
||||
});
|
||||
}
|
||||
}));
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
@ -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;
|
||||
});
|
||||
|
||||
|
@ -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 {
|
||||
|
3
src/server/api/logger.ts
Normal file
3
src/server/api/logger.ts
Normal file
@ -0,0 +1,3 @@
|
||||
import Logger from "../../misc/logger";
|
||||
|
||||
export const apiLogger = new Logger('api');
|
Reference in New Issue
Block a user