Merge pull request #4795 from alltilla/qbittorrent-and-pihole-set-sev…

…erity `pihole-ftl()`: Use the new parsing of `set-severity()`
syslog-ng · Jan 24, 2024 · 0fa3da3 · 0fa3da3
2 parents 8f87f60 + b35c38c
commit 0fa3da3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 18 deletions.
diff --git a/scl/pihole/pihole.conf b/scl/pihole/pihole.conf
@@ -25,7 +25,7 @@ block parser pihole_ftl()
   channel {
     parser {
       regexp-parser(
-        patterns('^\[([^ ]+ [^ ]+) [^ \]]+\] (FATAL:|ERR:|ERROR:|Error:|WARN:|WARNING:|Warning:|Notice:|INFO:|DEBUG:|) ?(?<MESSAGE>.*)')
+        patterns('^\[([^ ]+ [^ ]+) [^ \]]+\] (?:(FATAL|ERR|ERROR|Error|WARN|WARNING|Warning|Notice|INFO|DEBUG):|) ?(?<MESSAGE>.*)')
       );
       date-parser(
         template("$1")
@@ -35,23 +35,8 @@ block parser pihole_ftl()
 
     rewrite {
       set("Pi-hole" value("APP"));
+      set-severity("$2" condition("$2" ne ""));
     };
-
-    if ("$2" eq "") {
-      # No severity was found.
-    } elif (match("FATAL" value("2"))) {
-      rewrite { set-severity("emergency"); };
-    } elif (match("^(ERR|ERROR|Error):$" value("2"))) {
-      rewrite { set-severity("error"); };
-    } elif (match("^(WARN|WARNING|Warning):$" value("2"))) {
-      rewrite { set-severity("warning"); };
-    } elif (match("^(Notice):$" value("2"))) {
-      rewrite { set-severity("notice"); };
-    } elif (match("^(INFO):$" value("2"))) {
-      rewrite { set-severity("info"); };
-    } elif (match("^(DEBUG):$" value("2"))) {
-      rewrite { set-severity("debug"); };
-    } else {};
   };
 };
 

diff --git a/scl/qbittorrent/qbittorrent.conf b/scl/qbittorrent/qbittorrent.conf
@@ -45,7 +45,7 @@ block parser qbittorrent()
       rewrite { set-severity("info"); };
     } elif (match("N" value("1") type("string"))) {
       rewrite { set-severity("notice"); };
-    } else {};
+    };
   };
 };