From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id D23D79392B for ; Thu, 5 Jan 2023 15:26:12 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A529B3D41 for ; Thu, 5 Jan 2023 15:25:42 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Thu, 5 Jan 2023 15:25:41 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 3488B45202 for ; Thu, 5 Jan 2023 15:25:41 +0100 (CET) Date: Thu, 5 Jan 2023 15:25:40 +0100 (CET) From: Christian Ebner To: Wolfgang Bumiller Cc: pve-devel@lists.proxmox.com Message-ID: <1639251368.2809.1672928740419@webmail.proxmox.com> In-Reply-To: <20230105132502.nks3zg34rhuyefcp@casey.proxmox.com> References: <20230105091804.156599-1-c.ebner@proxmox.com> <20230105091804.156599-3-c.ebner@proxmox.com> <20230105132502.nks3zg34rhuyefcp@casey.proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Priority: 3 Importance: Normal X-Mailer: Open-Xchange Mailer v7.10.6-Rev32 X-Originating-Client: open-xchange-appsuite X-SPAM-LEVEL: Spam detection results: 0 BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [tools.pm] Subject: Re: [pve-devel] [RFC common 1/1] tools: Add specialized `dump_fw_logfile` for `since` and `until` filtering of firewall logs X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Jan 2023 14:26:12 -0000 Okay, I will adapt the code based on your comments. Thx! > On 05.01.2023 14:25 CET Wolfgang Bumiller wrote: > > > On Thu, Jan 05, 2023 at 10:18:04AM +0100, Christian Ebner wrote: > > This furhter includes the contents of rotated logfiles if present. All files are scanned in > > sequential order, as there is no guarantee that the rotated logs contain only entries for > > a single day. > > > > Signed-off-by: Christian Ebner > > --- > > src/PVE/Tools.pm | 80 ++++++++++++++++++++++++++++++++++++++++++++++++ > > 1 file changed, 80 insertions(+) > > > > diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm > > index cdbee6d..fdbf0e1 100644 > > --- a/src/PVE/Tools.pm > > +++ b/src/PVE/Tools.pm > > @@ -4,6 +4,7 @@ use strict; > > use warnings; > > > > use Date::Format qw(time2str); > > +use Date::Parse qw(str2time); > > use Digest::MD5; > > use Digest::SHA; > > use Encode; > > @@ -17,6 +18,7 @@ use IO::Handle; > > use IO::Pipe; > > use IO::Select; > > use IO::Socket::IP; > > +use IO::Zlib; > > use IPC::Open3; > > use JSON; > > use POSIX qw(EINTR EEXIST EOPNOTSUPP); > > @@ -1320,6 +1322,84 @@ sub dump_logfile { > > return ($count, $lines); > > } > > > > +sub dump_fw_logfile { > > So initially I thought, With this being firewall-specific I'd rather put > this in pve-firewall I think. > But given the 'HACK' and the copying of the $start/$limit/$filter > portion, maybe just split dump_logfile into a reusable part to which you > provide the IO handle and running $count as parameter instead of the > filename (IO handle because of the zlib part), and which recognizes when > `$filter` is a `sub` to call instead of just a regex (`ref($filter) eq > 'CODE'), or simply add those 2 parameters to dump_logfile directly. > At least I'd prefer more code reuse if it's already in this module.