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 7E80797FE for ; Tue, 26 Apr 2022 14:35:53 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 557A71BBF0 for ; Tue, 26 Apr 2022 14:35:52 +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 EF11E1BB8A for ; 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 C676942BF6 for ; Tue, 26 Apr 2022 14:35:49 +0200 (CEST) From: Daniel Tschlatscher To: pve-devel@lists.proxmox.com Date: Tue, 26 Apr 2022 14:35:39 +0200 Message-Id: <20220426123542.154739-5-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.190 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [tasks.pm] Subject: [pve-devel] [PATCH manager 1/1] fix #3971: Revised task log API call when parameter 'limit' is 0 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: Tue, 26 Apr 2022 12:35:53 -0000 The API call for fetching a tasklog with limit=0 now returns the whole log as a file stream rather than reading all lines in memory and then transfering them in JSON format. The behaviour when the url parameter limit is undefined or not 0 is the same as before, in accordance with the API specification. Also replaced the system-report and PBSEdit file download with a call to the newly added downloadStringAsFile() function in the proxmox- widget-toolkit repository in the Utils class (Proxmox.Utils). Signed-off-by: Daniel Tschlatscher --- PVE/API2/Tasks.pm | 13 ++++++++++--- www/manager6/node/Subscription.js | 20 ++++---------------- 2 files changed, 14 insertions(+), 19 deletions(-) diff --git a/PVE/API2/Tasks.pm b/PVE/API2/Tasks.pm index 9cd1e56b..5572f826 100644 --- a/PVE/API2/Tasks.pm +++ b/PVE/API2/Tasks.pm @@ -5,6 +5,7 @@ use warnings; use POSIX; use IO::File; use File::ReadBackwards; +use File::stat; use PVE::Tools; use PVE::SafeSyslog; use PVE::RESTHandler; @@ -387,11 +388,17 @@ __PACKAGE__->register_method({ $rpcenv->check($user, "/nodes/$node", [ 'Sys.Audit' ]); } - my ($count, $lines) = PVE::Tools::dump_logfile($filename, $start, $limit); + if ($limit == 0) { + # TCP Max Transfer Unit size is 1500, compression for lower numbers has no effect + my $use_compression = stat($filename)->size > 1500; + return PVE::Tools::stream_logfile($filename, $use_compression, $param->{upid}); + } else { + my ($count, $lines) = PVE::Tools::dump_logfile($filename, $start, $limit); - $rpcenv->set_result_attrib('total', $count); + $rpcenv->set_result_attrib('total', $count); - return $lines; + return $lines; + } }}); diff --git a/www/manager6/node/Subscription.js b/www/manager6/node/Subscription.js index 2558f523..147eeed1 100644 --- a/www/manager6/node/Subscription.js +++ b/www/manager6/node/Subscription.js @@ -58,22 +58,10 @@ Ext.define('PVE.node.Subscription', { { text: gettext('Download'), handler: function() { - var fileContent = Ext.String.htmlDecode(reportWindow.getComponent('system-report-view').html); - var fileName = getReportFileName(); - - // Internet Explorer - if (window.navigator.msSaveOrOpenBlob) { - navigator.msSaveOrOpenBlob(new Blob([fileContent]), fileName); - } else { - var element = document.createElement('a'); - element.setAttribute('href', 'data:text/plain;charset=utf-8,' + - encodeURIComponent(fileContent)); - element.setAttribute('download', fileName); - element.style.display = 'none'; - document.body.appendChild(element); - element.click(); - document.body.removeChild(element); - } + let fileContent = Ext.String.htmlDecode(reportWindow.getComponent('system-report-view').html); + let fileName = getReportFileName(); + + Proxmox.Utils.downloadStringAsFile(fileContent, fileName); }, }, ], -- 2.30.2