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 82FA7B2F4 for ; Wed, 23 Nov 2022 16:01:58 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5573723EE7 for ; Wed, 23 Nov 2022 16:01:28 +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 ; Wed, 23 Nov 2022 16:01:25 +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 C856244D9C; Wed, 23 Nov 2022 15:53:02 +0100 (CET) From: Daniel Tschlatscher To: pve-devel@lists.proxmox.com, pbs-devel@lists.proxmox.com, pmg-devel@lists.proxmox.com Date: Wed, 23 Nov 2022 15:52:10 +0100 Message-Id: <20221123145210.592981-5-d.tschlatscher@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221123145210.592981-1-d.tschlatscher@proxmox.com> References: <20221123145210.592981-1-d.tschlatscher@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.383 Adjusted score from AWL reputation of From: address 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 KAM_NUMSUBJECT 0.5 Subject ends in numbers excluding current years SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pmg-devel] [PATCH common v4] return whole log file if limit is 0 X-BeenThere: pmg-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Mail Gateway development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Nov 2022 15:01:58 -0000 The dump_logfile now returns the whole log file if the limit parameter is set to 0. This must be done explicitely though, as in the case of 'limit' being undefined, the default as before, 50 will be used. Signed-off-by: Daniel Tschlatscher --- Changes from v3: * NEW patch This patch also affects the API endpoints for: * the ceph log file * replication log files * firewall Guest and Host log files It does not change how they behave in the GUI though, as all of the corresponding API calls there do not specify a 'limit=0' parameter. In fact, none of them specify any limit, therefore, the default value of 50 still applies. src/PVE/Tools.pm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm index eb81b96..6072eb7 100644 --- a/src/PVE/Tools.pm +++ b/src/PVE/Tools.pm @@ -1278,9 +1278,10 @@ sub dump_logfile { return ($count, $lines); } - $start = 0 if !$start; - $limit = 50 if !$limit; + $start = $start // 0; + $limit = $limit // 50; + my $read_until_end = ($limit == 0) ? 1 : 0; my $line; if ($filter) { @@ -1288,18 +1289,22 @@ sub dump_logfile { while (defined($line = <$fh>)) { next if $line !~ m/$filter/; next if $count++ < $start; - next if $limit <= 0; + if (!$read_until_end) { + next if $limit <= 0; + $limit--; + } chomp $line; push @$lines, { n => $count, t => $line}; - $limit--; } } else { while (defined($line = <$fh>)) { next if $count++ < $start; - next if $limit <= 0; + if (!$read_until_end) { + next if $limit <= 0; + $limit--; + } chomp $line; push @$lines, { n => $count, t => $line}; - $limit--; } } -- 2.30.2