summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2023-02-03 15:08:36 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2023-02-03 15:08:36 +0900
commit825551d64f0af9114ee9987f58aa8e253c9e7d41 (patch)
tree49e8fd564e40f6869b458835b922f0f2cf607c1c /packages
parentUpdate CHANGELOG.md (diff)
downloadsharkey-825551d64f0af9114ee9987f58aa8e253c9e7d41.tar.gz
sharkey-825551d64f0af9114ee9987f58aa8e253c9e7d41.tar.bz2
sharkey-825551d64f0af9114ee9987f58aa8e253c9e7d41.zip
drop syslog
Close #9774
Diffstat (limited to 'packages')
-rw-r--r--packages/backend/package.json2
-rw-r--r--packages/backend/src/config.ts7
-rw-r--r--packages/backend/src/core/LoggerService.ts18
-rw-r--r--packages/backend/src/logger.ts18
4 files changed, 3 insertions, 42 deletions
diff --git a/packages/backend/package.json b/packages/backend/package.json
index 3496c79c78..762cb4b4d5 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -110,7 +110,6 @@
"strict-event-emitter-types": "2.0.0",
"stringz": "2.1.0",
"summaly": "2.7.0",
- "syslog-pro": "git+https://github.com/misskey-dev/SyslogPro#0.2.9-misskey.2",
"systeminformation": "5.17.8",
"tinycolor2": "1.5.2",
"tmp": "0.2.1",
@@ -167,7 +166,6 @@
"@types/sharp": "0.31.1",
"@types/sinonjs__fake-timers": "8.1.2",
"@types/speakeasy": "2.0.7",
- "@types/syslog-pro": "1.0.0",
"@types/tinycolor2": "1.4.3",
"@types/tmp": "0.2.3",
"@types/unzipper": "0.10.5",
diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts
index 025d7acdeb..1d4e700656 100644
--- a/packages/backend/src/config.ts
+++ b/packages/backend/src/config.ts
@@ -65,11 +65,6 @@ export type Source = {
deliverJobMaxAttempts?: number;
inboxJobMaxAttempts?: number;
- syslog: {
- host: string;
- port: number;
- };
-
mediaProxy?: string;
proxyRemoteFiles?: boolean;
@@ -113,7 +108,7 @@ const path = process.env.NODE_ENV === 'test'
export function loadConfig() {
const meta = JSON.parse(fs.readFileSync(`${_dirname}/../../../built/meta.json`, 'utf-8'));
- const clientManifestExists = fs.existsSync(_dirname + '/../../../built/_vite_/manifest.json')
+ const clientManifestExists = fs.existsSync(_dirname + '/../../../built/_vite_/manifest.json');
const clientManifest = clientManifestExists ?
JSON.parse(fs.readFileSync(`${_dirname}/../../../built/_vite_/manifest.json`, 'utf-8'))
: { 'src/init.ts': { file: 'src/init.ts' } };
diff --git a/packages/backend/src/core/LoggerService.ts b/packages/backend/src/core/LoggerService.ts
index 221631f129..441c254f48 100644
--- a/packages/backend/src/core/LoggerService.ts
+++ b/packages/backend/src/core/LoggerService.ts
@@ -1,5 +1,4 @@
import { Inject, Injectable } from '@nestjs/common';
-import * as SyslogPro from 'syslog-pro';
import { DI } from '@/di-symbols.js';
import type { Config } from '@/config.js';
import Logger from '@/logger.js';
@@ -8,29 +7,14 @@ import type { KEYWORD } from 'color-convert/conversions';
@Injectable()
export class LoggerService {
- private syslogClient;
-
constructor(
@Inject(DI.config)
private config: Config,
) {
- if (this.config.syslog) {
- this.syslogClient = new SyslogPro.RFC5424({
- applicationName: 'Misskey',
- timestamp: true,
- includeStructuredData: true,
- color: true,
- extendedColor: true,
- server: {
- target: config.syslog.host,
- port: config.syslog.port,
- },
- });
- }
}
@bindThis
public getLogger(domain: string, color?: KEYWORD | undefined, store?: boolean) {
- return new Logger(domain, color, store, this.syslogClient);
+ return new Logger(domain, color, store);
}
}
diff --git a/packages/backend/src/logger.ts b/packages/backend/src/logger.ts
index 5d275bc7b2..87f9b12313 100644
--- a/packages/backend/src/logger.ts
+++ b/packages/backend/src/logger.ts
@@ -17,15 +17,13 @@ export default class Logger {
private context: Context;
private parentLogger: Logger | null = null;
private store: boolean;
- private syslogClient: any | null = null;
- constructor(context: string, color?: KEYWORD, store = true, syslogClient = null) {
+ constructor(context: string, color?: KEYWORD, store = true) {
this.context = {
name: context,
color: color,
};
this.store = store;
- this.syslogClient = syslogClient;
}
@bindThis
@@ -69,20 +67,6 @@ export default class Logger {
console.log(important ? chalk.bold(log) : log);
if (level === 'error' && data) console.log(data);
-
- if (store) {
- if (this.syslogClient) {
- const send =
- level === 'error' ? this.syslogClient.error :
- level === 'warning' ? this.syslogClient.warning :
- level === 'success' ? this.syslogClient.info :
- level === 'debug' ? this.syslogClient.info :
- level === 'info' ? this.syslogClient.info :
- null as never;
-
- send.bind(this.syslogClient)(message).catch(() => {});
- }
- }
}
@bindThis