Merge pull request #1407 from sakura-tel/20230502-delete-log

delete: drop logs

migration/1683005883304-delete-log.ts

@@ -0,0 +1,15 @@
+import {MigrationInterface, QueryRunner} from "typeorm";
+
+export class deleteLog1683005883304 implements MigrationInterface {
+    name = 'deleteLog1683005883304'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+			await queryRunner.query(`DROP TABLE "log"`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+			await queryRunner.query(`CREATE TABLE "log" ("id" character varying(32) NOT NULL, "createdAt" TIMESTAMP WITH TIME ZONE NOT NULL, "domain" character varying(64) array NOT NULL DEFAULT '{}'::varchar[], "level" "log_level_enum" NOT NULL, "worker" character varying(8) NOT NULL, "machine" character varying(128) NOT NULL, "message" character varying(2048) NOT NULL, "data" jsonb NOT NULL DEFAULT '{}', CONSTRAINT "PK_350604cbdf991d5930d9e618fbd" PRIMARY KEY ("id"))`);
+
+    }
+
+}

src/client/app/admin/views/index.vue

@@ -24,7 +24,6 @@
 				<li><router-link to="/dashboard" active-class="active"><fa icon="home" fixed-width/>{{ $t('dashboard') }}</router-link></li>
 				<li><router-link to="/instance" active-class="active" v-if="$store.getters.isAdmin"><fa icon="cog" fixed-width/>{{ $t('instance') }}</router-link></li>
 				<li><router-link to="/queue" active-class="active"><fa :icon="faTasks" fixed-width/>{{ $t('queue') }}</router-link></li>
-				<li><router-link to="/logs" active-class="active"><fa :icon="faStream" fixed-width/>{{ $t('logs') }}</router-link></li>
 				<li><router-link to="/db" active-class="active" v-if="$store.getters.isAdmin"><fa :icon="faDatabase" fixed-width/>{{ $t('db') }}</router-link></li>
 				<li><router-link to="/moderators" active-class="active" v-if="$store.getters.isAdmin"><fa :icon="faHeadset" fixed-width/>{{ $t('moderators') }}</router-link></li>
 				<li><router-link to="/users" active-class="active"><fa icon="users" fixed-width/>{{ $t('users') }}</router-link></li>
@@ -48,7 +47,6 @@
 					<div v-if="page == 'dashboard'"><x-dashboard/></div>
 					<div v-if="page == 'instance'"><x-instance/></div>
 					<div v-if="page == 'queue'"><x-queue/></div>
-					<div v-if="page == 'logs'"><x-logs/></div>
 					<div v-if="page == 'db'"><x-db/></div>
 					<div v-if="page == 'moderators'"><x-moderators/></div>
 					<div v-if="page == 'users'"><x-users/></div>
@@ -76,7 +74,6 @@ import { version } from '../../config';
 import XDashboard from './dashboard.vue';
 import XInstance from './instance.vue';
 import XQueue from './queue.vue';
-import XLogs from './logs.vue';
 import XDb from './db.vue';
 import XModerators from './moderators.vue';
 import XEmoji from './emoji.vue';
@@ -87,7 +84,7 @@ import XAbuse from './abuse.vue';
 import XFederation from './federation.vue';
 import XRelays from "./relays.vue";
 
-import { faHeadset, faArrowLeft, faGlobe, faProjectDiagram, faExclamationCircle, faTasks, faStream, faDatabase } from '@fortawesome/free-solid-svg-icons';
+import { faHeadset, faArrowLeft, faGlobe, faProjectDiagram, faExclamationCircle, faTasks, faDatabase } from '@fortawesome/free-solid-svg-icons';
 import { faGrin } from '@fortawesome/free-regular-svg-icons';
 
 // Detect the user agent
@@ -100,7 +97,6 @@ export default Vue.extend({
 		XDashboard,
 		XInstance,
 		XQueue,
-		XLogs,
 		XDb,
 		XModerators,
 		XEmoji,
@@ -126,7 +122,6 @@ export default Vue.extend({
 			faProjectDiagram,
 			faExclamationCircle,
 			faTasks,
-			faStream,
 			faDatabase,
 		};
 	},

src/db/postgre.ts

@@ -4,7 +4,6 @@ import { entities as charts } from '../services/chart/entities';
 import { dbLogger } from './logger';
 import * as highlight from 'cli-highlight';
 
-import { Log } from '../models/entities/log';
 import { User } from '../models/entities/user';
 import { DriveFile } from '../models/entities/drive-file';
 import { DriveFolder } from '../models/entities/drive-folder';
@@ -119,7 +118,6 @@ export const entities = [
 	NoteUnread,
 	Page,
 	PageLike,
-	Log,
 	DriveFile,
 	DriveFolder,
 	Poll,

src/models/index.ts

@@ -12,7 +12,6 @@ import { UserRepository } from './repositories/user';
 import { NoteRepository } from './repositories/note';
 import { DriveFileRepository } from './repositories/drive-file';
 import { DriveFolderRepository } from './repositories/drive-folder';
-import { Log } from './entities/log';
 import { AccessToken } from './entities/access-token';
 import { UserNotePining } from './entities/user-note-pinings';
 import { SigninRepository } from './repositories/signin';
@@ -88,7 +87,6 @@ export const Signins = getCustomRepository(SigninRepository);
 export const MessagingMessages = getCustomRepository(MessagingMessageRepository);
 export const ReversiGames = getCustomRepository(ReversiGameRepository);
 export const ReversiMatchings = getCustomRepository(ReversiMatchingRepository);
-export const Logs = getRepository(Log);
 export const Pages = getCustomRepository(PageRepository);
 export const PageLikes = getCustomRepository(PageLikeRepository);
 export const ModerationLogs = getCustomRepository(ModerationLogRepository);

src/services/logger.ts

@@ -1,11 +1,7 @@
 import * as cluster from 'cluster';
-import * as os from 'os';
 import * as chalk from 'chalk';
 import * as dateformat from 'dateformat';
 import { envOption } from '../env';
-import { getRepository } from 'typeorm';
-import { Log } from '../models/entities/log';
-import { genId } from '../misc/gen-id';
 import config from '../config';
 
 const SyslogPro = require('syslog-pro');
@@ -94,18 +90,6 @@ export default class Logger {
 					null as never;
 
 				send.bind(this.syslogClient)(message).catch(() => {});
-			} else {
-				const Logs = getRepository(Log);
-				Logs.insert({
-					id: genId(),
-					createdAt: new Date(),
-					machine: os.hostname(),
-					worker: worker.toString(),
-					domain: [this.domain].concat(subDomains).map(d => d.name),
-					level: level,
-					message: message.substring(0, 1000), // 1024を超えるとログが挿入できずエラーになり無限ループする
-					data: data,
-				} as Log).catch(() => {});
 			}
 		}
 	}