From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <d.tschlatscher@proxmox.com>
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 5A6C197F6
for <pve-devel@lists.proxmox.com>; Tue, 26 Apr 2022 14:35:51 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 512FB1BBB1
for <pve-devel@lists.proxmox.com>; Tue, 26 Apr 2022 14:35:51 +0200 (CEST)
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))
(No client certificate requested)
by firstgate.proxmox.com (Proxmox) with ESMTPS id F00401BB8B
for <pve-devel@lists.proxmox.com>; Tue, 26 Apr 2022 14:35:49 +0200 (CEST)
Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1])
by proxmox-new.maurer-it.com (Proxmox) with ESMTP id C7C1942BFC
for <pve-devel@lists.proxmox.com>; Tue, 26 Apr 2022 14:35:49 +0200 (CEST)
From: Daniel Tschlatscher <d.tschlatscher@proxmox.com>
To: pve-devel@lists.proxmox.com
Date: Tue, 26 Apr 2022 14:35:38 +0200
Message-Id: <20220426123542.154739-4-d.tschlatscher@proxmox.com>
X-Mailer: git-send-email 2.30.2
In-Reply-To: <20220426123542.154739-1-d.tschlatscher@proxmox.com>
References: <20220426123542.154739-1-d.tschlatscher@proxmox.com>
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.068 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
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: [pve-devel] [PATCH common 1/1] fix #3971: Create log file stream
for download
X-BeenThere: pve-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox VE development discussion <pve-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pve-devel/>
List-Post: <mailto:pve-devel@lists.proxmox.com>
List-Help: <mailto:pve-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel>,
<mailto:pve-devel-request@lists.proxmox.com?subject=subscribe>
X-List-Received-Date: Tue, 26 Apr 2022 12:35:51 -0000
Creating the filestream for the tasklog download is sourced in its own
function to avoid redundant implementations in pmg-api and pve-manager
.
Signed-off-by: Daniel Tschlatscher <d.tschlatscher@proxmox.com>
---
src/PVE/Tools.pm | 27 +++++++++++++++++++++++++++
1 file changed, 27 insertions(+)
diff --git a/src/PVE/Tools.pm b/src/PVE/Tools.pm
index dac0a2b..ec8681a 100644
--- a/src/PVE/Tools.pm
+++ b/src/PVE/Tools.pm
@@ -2016,4 +2016,31 @@ sub get_file_hash {
return lc($digest);
}
+sub stream_logfile {
+ my ($filename, $compress, $suggested_name) = @_;
+
+ my $fh;
+ $suggested_name = $suggested_name // $filename;
+
+ if ($compress) {
+ my $cmd = ["/usr/bin/gzip", "-c", "$filename"];
+
+ open($fh, "-|", join(' ', @$cmd))
+ or die "Could not create compressed file stream for $filename - $!";
+ } else {
+ open($fh, '<', $filename)
+ or die "Could not open file $filename - $!";
+ }
+
+ return {
+ download => {
+ fh => $fh,
+ stream => 1,
+ 'content-encoding' => $compress ? 'gzip' : undef,
+ 'content-type' => 'text/plain',
+ 'content-disposition' => "attachment; filename=\"$suggested_name\"",
+ },
+ },
+}
+
1;
--
2.30.2