ログをデータベースに保存して管理画面で見れるように

5 files changed, 56 insertions, 5 deletions

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');
diff --git a/src/server/index.ts b/src/server/index.ts
index 470562d802..7c51923f9e 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -23,10 +23,10 @@ import networkChart from '../services/chart/network';
 import apiServer from './api';
 import { sum } from '../prelude/array';
 import User from '../models/user';
-import Logger from '../misc/logger';
+import Logger from '../services/logger';
 import { program } from '../argv';
 
-export const serverLogger = new Logger('server', 'gray');
+export const serverLogger = new Logger('server', 'gray', false);
 
 // Init app
 const app = new Koa();
diff --git a/src/server/web/url-preview.ts b/src/server/web/url-preview.ts
index 9fda5f16f8..90c1a4930a 100644
--- a/src/server/web/url-preview.ts
+++ b/src/server/web/url-preview.ts
@@ -2,7 +2,7 @@ import * as Koa from 'koa';
 import * as request from 'request-promise-native';
 import summaly from 'summaly';
 import fetchMeta from '../../misc/fetch-meta';
-import Logger from '../../misc/logger';
+import Logger from '../../services/logger';
 
 const logger = new Logger('url-preview');