From a546c1bf0d8b9ee47edb814e4947288fa639a616 Mon Sep 17 00:00:00 2001
From: Andrew Ferrazzutti <andrewf@element.io>
Date: Fri, 15 Sep 2023 03:35:06 -0400
Subject: [PATCH] Actually ignore logging disabled modules (#902)
* Actually ignore logging disabled modules
* Fix enabled/disabled log config in sample
---
changelog.d/902.bugfix | 1 +
config/config.sample.yaml | 4 ++--
src/log.ts | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
create mode 100644 changelog.d/902.bugfix
diff --git a/changelog.d/902.bugfix b/changelog.d/902.bugfix
new file mode 100644
index 0000000..b93fa65
--- /dev/null
+++ b/changelog.d/902.bugfix
@@ -0,0 +1 @@
+Let file logs correctly ignore modules matching "logging.files[*].disabled" in the configuration file.
diff --git a/config/config.sample.yaml b/config/config.sample.yaml
index 3443e4a..27accc1 100644
--- a/config/config.sample.yaml
+++ b/config/config.sample.yaml
@@ -58,13 +58,13 @@ logging:
lineDateFormat: "MMM-D HH:mm:ss.SSS" # This is in moment.js format
files:
- file: "debug.log"
- disable:
+ disabled:
- "PresenceHandler" # Will not capture presence logging
- file: "warn.log" # Will capture warnings
level: "warn"
- file: "botlogs.log" # Will capture logs from DiscordBot
level: "info"
- enable:
+ enabled:
- "DiscordBot"
database:
# You may either use SQLite or Postgresql for the bridge database, which contains
diff --git a/src/log.ts b/src/log.ts
index 085b7b2..3aa3c9c 100644
--- a/src/log.ts
+++ b/src/log.ts
@@ -78,7 +78,7 @@ export class Log {
private static setupFileTransport(config: LoggingFile): transports.FileTransportInstance {
config = Object.assign(new LoggingFile(), config);
const filterOutMods = format((info, _) => {
- if (config.disabled.includes(info.module) &&
+ if (config.disabled.includes(info.module) ||
config.enabled.length > 0 &&
!config.enabled.includes(info.module)
) {
--
GitLab