From 977af0a24d3f0b3cb9799d133b02c6316f286660 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 2 Mar 2019 18:51:59 +0900 Subject: ログをデータベースに保存して管理画面で見れるように MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/api/endpoints/admin/logs.ts | 51 ++++++++++++++++++++++++++++++++++ src/server/api/limiter.ts | 2 +- src/server/api/logger.ts | 2 +- 3 files changed, 53 insertions(+), 2 deletions(-) create mode 100644 src/server/api/endpoints/admin/logs.ts (limited to 'src/server/api') diff --git a/src/server/api/endpoints/admin/logs.ts b/src/server/api/endpoints/admin/logs.ts new file mode 100644 index 0000000000..b5dc7d7283 --- /dev/null +++ b/src/server/api/endpoints/admin/logs.ts @@ -0,0 +1,51 @@ +import $ from 'cafy'; +import define from '../../define'; +import Log from '../../../../models/log'; + +export const meta = { + tags: ['admin'], + + requireCredential: true, + requireModerator: true, + + params: { + limit: { + validator: $.optional.num.range(1, 100), + default: 30 + }, + + level: { + validator: $.optional.nullable.str, + default: null as any + }, + + domain: { + validator: $.optional.nullable.str, + default: null as any + } + } +}; + +export default define(meta, async (ps) => { + const sort = { + _id: -1 + }; + const query = {} as any; + + if (ps.level) query.level = ps.level; + if (ps.domain) { + let i = 0; + for (const d of ps.domain.split(' ')) { + query[`domain.${i}`] = d; + i++; + } + } + + const logs = await Log + .find(query, { + limit: ps.limit, + sort: sort + }); + + return logs; +}); diff --git a/src/server/api/limiter.ts b/src/server/api/limiter.ts index f5c326f7d1..3d66172fd8 100644 --- a/src/server/api/limiter.ts +++ b/src/server/api/limiter.ts @@ -3,7 +3,7 @@ import limiterDB from '../../db/redis'; import { IEndpoint } from './endpoints'; import getAcct from '../../misc/acct/render'; import { IUser } from '../../models/user'; -import Logger from '../../misc/logger'; +import Logger from '../../services/logger'; const logger = new Logger('limiter'); diff --git a/src/server/api/logger.ts b/src/server/api/logger.ts index 334a696331..0ea67a90eb 100644 --- a/src/server/api/logger.ts +++ b/src/server/api/logger.ts @@ -1,3 +1,3 @@ -import Logger from "../../misc/logger"; +import Logger from "../../services/logger"; export const apiLogger = new Logger('api'); -- cgit v1.2.3-freya