diff options
Diffstat (limited to 'src/models')
| -rw-r--r-- | src/models/drive-file.ts | 4 | ||||
| -rw-r--r-- | src/models/favorite.ts | 4 | ||||
| -rw-r--r-- | src/models/note.ts | 10 | ||||
| -rw-r--r-- | src/models/notification.ts | 6 | ||||
| -rw-r--r-- | src/models/user.ts | 4 |
5 files changed, 14 insertions, 14 deletions
diff --git a/src/models/drive-file.ts b/src/models/drive-file.ts index b34ba7ded8..62a544c214 100644 --- a/src/models/drive-file.ts +++ b/src/models/drive-file.ts @@ -2,7 +2,7 @@ import * as mongo from 'mongodb'; import * as deepcopy from 'deepcopy'; import { pack as packFolder } from './drive-folder'; import { pack as packUser } from './user'; -import monkDb, { nativeDbConn } from '../db/mongodb'; +import monkDb, { nativeDbConn, dbLogger } from '../db/mongodb'; import isObjectId from '../misc/is-objectid'; import getDriveFileUrl, { getOriginalUrl } from '../misc/get-drive-file-url'; @@ -171,7 +171,7 @@ export const pack = ( // (データベースの欠損などで)ファイルがデータベース上に見つからなかったとき if (_file == null) { - console.warn(`[DAMAGED DB] (missing) pkg: driveFile :: ${file}`); + dbLogger.warn(`[DAMAGED DB] (missing) pkg: driveFile :: ${file}`); return resolve(null); } diff --git a/src/models/favorite.ts b/src/models/favorite.ts index 0a8fec020f..e3aa92c887 100644 --- a/src/models/favorite.ts +++ b/src/models/favorite.ts @@ -1,6 +1,6 @@ import * as mongo from 'mongodb'; import * as deepcopy from 'deepcopy'; -import db from '../db/mongodb'; +import db, { dbLogger } from '../db/mongodb'; import isObjectId from '../misc/is-objectid'; import { pack as packNote } from './note'; @@ -56,7 +56,7 @@ export const pack = ( // (データベースの不具合などで)投稿が見つからなかったら if (_favorite.note == null) { - console.warn(`[DAMAGED DB] (missing) pkg: favorite -> note :: ${_favorite.id} (note ${_favorite.noteId})`); + dbLogger.warn(`[DAMAGED DB] (missing) pkg: favorite -> note :: ${_favorite.id} (note ${_favorite.noteId})`); return resolve(null); } diff --git a/src/models/note.ts b/src/models/note.ts index a887cf1c84..b3d5ed6977 100644 --- a/src/models/note.ts +++ b/src/models/note.ts @@ -1,7 +1,7 @@ import * as mongo from 'mongodb'; import * as deepcopy from 'deepcopy'; import rap from '@prezzemolo/rap'; -import db from '../db/mongodb'; +import db, { dbLogger } from '../db/mongodb'; import isObjectId from '../misc/is-objectid'; import { length } from 'stringz'; import { IUser, pack as packUser } from './user'; @@ -231,7 +231,7 @@ export const pack = async ( // (データベースの欠損などで)投稿がデータベース上に見つからなかったとき if (_note == null) { - console.warn(`[DAMAGED DB] (missing) pkg: note :: ${note}`); + dbLogger.warn(`[DAMAGED DB] (missing) pkg: note :: ${note}`); return null; } @@ -367,18 +367,18 @@ export const pack = async ( //#region (データベースの欠損などで)参照しているデータがデータベース上に見つからなかったとき if (_note.user == null) { - console.warn(`[DAMAGED DB] (missing) pkg: note -> user :: ${_note.id} (user ${_note.userId})`); + dbLogger.warn(`[DAMAGED DB] (missing) pkg: note -> user :: ${_note.id} (user ${_note.userId})`); return null; } if (opts.detail) { if (_note.replyId != null && _note.reply == null) { - console.warn(`[DAMAGED DB] (missing) pkg: note -> reply :: ${_note.id} (reply ${_note.replyId})`); + dbLogger.warn(`[DAMAGED DB] (missing) pkg: note -> reply :: ${_note.id} (reply ${_note.replyId})`); return null; } if (_note.renoteId != null && _note.renote == null) { - console.warn(`[DAMAGED DB] (missing) pkg: note -> renote :: ${_note.id} (renote ${_note.renoteId})`); + dbLogger.warn(`[DAMAGED DB] (missing) pkg: note -> renote :: ${_note.id} (renote ${_note.renoteId})`); return null; } } diff --git a/src/models/notification.ts b/src/models/notification.ts index d49494391e..aedeafb522 100644 --- a/src/models/notification.ts +++ b/src/models/notification.ts @@ -1,6 +1,6 @@ import * as mongo from 'mongodb'; import * as deepcopy from 'deepcopy'; -import db from '../db/mongodb'; +import db, { dbLogger } from '../db/mongodb'; import isObjectId from '../misc/is-objectid'; import { IUser, pack as packUser } from './user'; import { pack as packNote } from './note'; @@ -106,12 +106,12 @@ export const pack = (notification: any) => new Promise<any>(async (resolve, reje // (データベースの不具合などで)投稿が見つからなかったら if (_notification.note == null) { - console.warn(`[DAMAGED DB] (missing) pkg: notification -> note :: ${_notification.id} (note ${_notification.noteId})`); + dbLogger.warn(`[DAMAGED DB] (missing) pkg: notification -> note :: ${_notification.id} (note ${_notification.noteId})`); return resolve(null); } break; default: - console.error(`Unknown type: ${_notification.type}`); + dbLogger.error(`Unknown type: ${_notification.type}`); break; } diff --git a/src/models/user.ts b/src/models/user.ts index 66f515ddab..2453a2ed15 100644 --- a/src/models/user.ts +++ b/src/models/user.ts @@ -1,7 +1,7 @@ import * as mongo from 'mongodb'; import * as deepcopy from 'deepcopy'; import rap from '@prezzemolo/rap'; -import db from '../db/mongodb'; +import db, { dbLogger } from '../db/mongodb'; import isObjectId from '../misc/is-objectid'; import { packMany as packNoteMany } from './note'; import Following from './following'; @@ -286,7 +286,7 @@ export const pack = ( // (データベースの欠損などで)ユーザーがデータベース上に見つからなかったとき if (_user == null) { - console.warn(`user not found on database: ${user}`); + dbLogger.warn(`user not found on database: ${user}`); return resolve(null); } |