Use internal logger instead of debug/console for logging

Resolve #4104
Resolve #1966
Resolve #1937
This commit is contained in:
syuilo
2019-02-03 18:16:57 +09:00
parent 3a5867b324
commit 0868c3517f
41 changed files with 136 additions and 109 deletions

View File

@ -4,6 +4,9 @@ import { renderActivity } from '../../remote/activitypub/renderer';
import renderBlock from '../../remote/activitypub/renderer/block';
import renderUndo from '../../remote/activitypub/renderer/undo';
import { deliver } from '../../queue';
import Logger from '../../misc/logger';
const logger = new Logger('blocking/delete');
export default async function(blocker: IUser, blockee: IUser) {
const blocking = await Blocking.findOne({
@ -12,7 +15,7 @@ export default async function(blocker: IUser, blockee: IUser) {
});
if (blocking == null) {
console.warn('ブロック解除がリクエストされましたがブロックしていませんでした');
logger.warn('ブロック解除がリクエストされましたがブロックしていませんでした');
return;
}

View File

@ -6,6 +6,9 @@ import renderFollow from '../../remote/activitypub/renderer/follow';
import renderUndo from '../../remote/activitypub/renderer/undo';
import { deliver } from '../../queue';
import perUserFollowingChart from '../../chart/per-user-following';
import Logger from '../../misc/logger';
const logger = new Logger('following/delete');
export default async function(follower: IUser, followee: IUser) {
const following = await Following.findOne({
@ -14,7 +17,7 @@ export default async function(follower: IUser, followee: IUser) {
});
if (following == null) {
console.warn('フォロー解除がリクエストされましたがフォローしていませんでした');
logger.warn('フォロー解除がリクエストされましたがフォローしていませんでした');
return;
}

View File

@ -7,6 +7,9 @@ import { deliver } from '../../../queue';
import Following from '../../../models/following';
import { publishMainStream } from '../../../stream';
import perUserFollowingChart from '../../../chart/per-user-following';
import Logger from '../../../misc/logger';
const logger = new Logger('following/requests/accept');
export default async function(followee: IUser, follower: IUser) {
let incremented = 1;
@ -29,7 +32,7 @@ export default async function(followee: IUser, follower: IUser) {
}
}).catch(e => {
if (e.code === 11000 && isRemoteUser(follower) && isLocalUser(followee)) {
console.log(`Accept => Insert duplicated ignore. ${follower._id} => ${followee._id}`);
logger.info(`Accept => Insert duplicated ignore. ${follower._id} => ${followee._id}`);
incremented = 0;
} else {
throw e;

View File

@ -495,7 +495,6 @@ async function insertNote(user: IUser, data: Option, tags: string[], emojis: str
return null;
}
console.error(e);
throw 'something happened';
}
}

View File

@ -30,7 +30,6 @@ export default async (user: IUser, note: INote, reaction: string) => new Promise
return rej('already reacted');
}
console.error(e);
return rej('something happened');
}