[1/2] WUI log-section Mail: bugfix for dmi

Message ID 20190831185300.20508-1-ipfire@starkstromkonsument.de
State Accepted
Commit 2da785f90bf2de9b9ea4a86a01fabccefd140e00
Headers
Series [1/2] WUI log-section Mail: bugfix for dmi |

Commit Message

Alexander Koch Aug. 31, 2019, 6:52 p.m. UTC
  The prefix for dmi in /var/log/mail seems to have changed from "dmi[<PID>]: " to "dmi: ". This results in a bug where no lines are being shown at all in the WUI.

Signed-off-by: Alex Koch <ipfire@starkstromkonsument.de>
---
 html/cgi-bin/logs.cgi/log.dat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
  

Comments

Michael Tremer Sept. 1, 2019, 12:31 p.m. UTC | #1
That change looks good to me!

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

> On 31 Aug 2019, at 19:52, Alex Koch <ipfire@starkstromkonsument.de> wrote:
> 
> The prefix for dmi in /var/log/mail seems to have changed from "dmi[<PID>]: " to "dmi: ". This results in a bug where no lines are being shown at all in the WUI.
> 
> Signed-off-by: Alex Koch <ipfire@starkstromkonsument.de>
> ---
> html/cgi-bin/logs.cgi/log.dat | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
> index 061525382..98b09041a 100644
> --- a/html/cgi-bin/logs.cgi/log.dat
> +++ b/html/cgi-bin/logs.cgi/log.dat
> @@ -57,7 +57,7 @@ my %sections = (
>         'cron' => '(fcron\[.*\]: )',
>         'ddns' => '(ddns\[\d+\]:)',
>         'dhcp' => '(dhcpd: )',
> -        'dma' => '(dma\[.*\]: )',
> +        'dma' => '(dma: |dma\[.*\]: )',
>         'guardian' => '(guardian\[.*\]: )',
>         'ipfire' => '(ipfire: )',
>         'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |charon: |vpnwatch: )',
> -- 
> 2.17.1
>
  

Patch

diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat
index 061525382..98b09041a 100644
--- a/html/cgi-bin/logs.cgi/log.dat
+++ b/html/cgi-bin/logs.cgi/log.dat
@@ -57,7 +57,7 @@  my %sections = (
         'cron' => '(fcron\[.*\]: )',
         'ddns' => '(ddns\[\d+\]:)',
         'dhcp' => '(dhcpd: )',
-        'dma' => '(dma\[.*\]: )',
+        'dma' => '(dma: |dma\[.*\]: )',
         'guardian' => '(guardian\[.*\]: )',
         'ipfire' => '(ipfire: )',
         'ipsec' => '(ipsec_[\w_]+: |pluto\[.*\]: |charon: |vpnwatch: )',