From patchwork Tue Feb 21 13:55:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6586 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4PLglx4LzNz3x1v for ; Tue, 21 Feb 2023 13:55:25 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4PLglw1lmSzqW; Tue, 21 Feb 2023 13:55:24 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4PLglw0TTsz2xfN; Tue, 21 Feb 2023 13:55:24 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4PLglt5S5Hz2xPs for ; Tue, 21 Feb 2023 13:55:22 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4PLglt1gYszH7; Tue, 21 Feb 2023 13:55:22 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1676987722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=XkuuGdLcoOy9Zh5dQihzBdQzVI1JGnDjn8ToyxITG2c=; b=/PYe5lHI8iL91pP+dnrqs4Hu6IN81t+SbR8w+598sO6peu9cOu/tcL+Juhh/J5spEPuw/y ijWOA8ozSCxIClAQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1676987722; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=XkuuGdLcoOy9Zh5dQihzBdQzVI1JGnDjn8ToyxITG2c=; b=KRBNoY2u23TKR2ZkSg6VYsAUb4rHxk+la0LPl/YymDx870SKOrvGHb+NEugP1JoV6TTvjA 7ODUwoHg2UwaGraBNhX3mvwu/d/LAVBpz2rM7r11+ig2MMOzRKFdYmSVayUTWDqwyMV9cP 4z81mESyND+0fFdu6zXXSr4vxz/yOYYKcgpa5hsQjWi2TliK0FGd117UpWI/xYqRR/ImK7 zk/lO5p1DREKbmvlLQQUvMXlEdDsB9TBlGr3SNO4OlnUELClcWkJ3ncfFxVGQuFdAolg5c bjuK8/Tcy4EcP64dN+oADscNJfFrOW8J6VW/RJmtZQx0L+6hoHBWtjinu+tM4Q== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] log.dat: Fixes bug#12950 - adding apcupsd to system logs list Date: Tue, 21 Feb 2023 14:55:17 +0100 Message-Id: <20230221135517.6286-1-adolf.belka@ipfire.org> MIME-Version: 1.0 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - Patch tested out on my production system that has apcupsd running on it. APCUPS was in the list of options in the system logs and entries from apcupsd were extracted correctly in the wui. Fixes: Bug#12950 Tested-by: Adolf Belka Signed-off-by: Adolf Belka Reviewed-by: Michael Tremer --- html/cgi-bin/logs.cgi/log.dat | 2 ++ 1 file changed, 2 insertions(+) diff --git a/html/cgi-bin/logs.cgi/log.dat b/html/cgi-bin/logs.cgi/log.dat index 5fb1fcd5d..bf71b3c9f 100644 --- a/html/cgi-bin/logs.cgi/log.dat +++ b/html/cgi-bin/logs.cgi/log.dat @@ -49,6 +49,7 @@ $cgiparams{'ACTION'} = ''; $cgiparams{'SECTION'} = 'ipfire'; my %sections = ( + 'apcupsd' => '(apcupsd\[.*?\]: )', 'auth' => '(\w+\(pam_unix\)\[.*\]: )', 'wio' => '(wio:|wio\[.*\])', 'captive' => '(Captive:)', @@ -81,6 +82,7 @@ my %sections = ( # Translations for the %sections array. my %trsections = ( + 'apcupsd' => 'APCUPS', 'auth' => "$Lang::tr{'loginlogout'}", 'wio' => 'Who Is Online?', 'captive' => $Lang::tr{'Captive'},