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 1900FAF4D for ; Tue, 8 Aug 2023 14:14:23 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EB82F9751 for ; Tue, 8 Aug 2023 14:13: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 for ; Tue, 8 Aug 2023 14:13:51 +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 A490C437CD for ; Tue, 8 Aug 2023 14:13:51 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Tue, 8 Aug 2023 14:13:42 +0200 Message-Id: <20230808121344.199500-5-h.laimer@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230808121344.199500-1-h.laimer@proxmox.com> References: <20230808121344.199500-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.017 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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. [mount.rs, pull.rs, diff.rs, catalog.rs, download-speed.rs, main.rs] Subject: [pbs-devel] [PATCH proxmox-backup v3 4/6] accept a ref to a HttpClient X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Aug 2023 12:14:23 -0000 ... since the functions don't actually need to own the value. Signed-off-by: Hannes Laimer --- examples/download-speed.rs | 2 +- pbs-client/src/backup_reader.rs | 2 +- proxmox-backup-client/src/catalog.rs | 4 ++-- proxmox-backup-client/src/main.rs | 2 +- proxmox-backup-client/src/mount.rs | 2 +- proxmox-file-restore/src/main.rs | 4 ++-- src/bin/proxmox_backup_debug/diff.rs | 2 +- src/server/pull.rs | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/download-speed.rs b/examples/download-speed.rs index c487d704..fe700982 100644 --- a/examples/download-speed.rs +++ b/examples/download-speed.rs @@ -34,7 +34,7 @@ async fn run() -> Result<(), Error> { let backup_time = proxmox_time::parse_rfc3339("2019-06-28T10:49:48Z")?; let client = BackupReader::start( - client, + &client, None, "store2", &BackupNamespace::root(), diff --git a/pbs-client/src/backup_reader.rs b/pbs-client/src/backup_reader.rs index 2cd4dc27..36d8ebcf 100644 --- a/pbs-client/src/backup_reader.rs +++ b/pbs-client/src/backup_reader.rs @@ -44,7 +44,7 @@ impl BackupReader { /// Create a new instance by upgrading the connection at '/api2/json/reader' pub async fn start( - client: HttpClient, + client: &HttpClient, crypt_config: Option>, datastore: &str, ns: &BackupNamespace, diff --git a/proxmox-backup-client/src/catalog.rs b/proxmox-backup-client/src/catalog.rs index 8c8c1458..72b22e67 100644 --- a/proxmox-backup-client/src/catalog.rs +++ b/proxmox-backup-client/src/catalog.rs @@ -75,7 +75,7 @@ async fn dump_catalog(param: Value) -> Result { let client = connect(&repo)?; let client = BackupReader::start( - client, + &client, crypt_config.clone(), repo.store(), &backup_ns, @@ -187,7 +187,7 @@ async fn catalog_shell(param: Value) -> Result<(), Error> { }; let client = BackupReader::start( - client, + &client, crypt_config.clone(), repo.store(), &backup_ns, diff --git a/proxmox-backup-client/src/main.rs b/proxmox-backup-client/src/main.rs index d9e7b899..d67b1373 100644 --- a/proxmox-backup-client/src/main.rs +++ b/proxmox-backup-client/src/main.rs @@ -1295,7 +1295,7 @@ async fn restore( }; let client = BackupReader::start( - client, + &client, crypt_config.clone(), repo.store(), &ns, diff --git a/proxmox-backup-client/src/mount.rs b/proxmox-backup-client/src/mount.rs index 242556d0..4a2f8335 100644 --- a/proxmox-backup-client/src/mount.rs +++ b/proxmox-backup-client/src/mount.rs @@ -234,7 +234,7 @@ async fn mount_do(param: Value, pipe: Option) -> Result { }; let client = BackupReader::start( - client, + &client, crypt_config.clone(), repo.store(), &backup_ns, diff --git a/proxmox-file-restore/src/main.rs b/proxmox-file-restore/src/main.rs index 9c74a476..50875a63 100644 --- a/proxmox-file-restore/src/main.rs +++ b/proxmox-file-restore/src/main.rs @@ -107,7 +107,7 @@ async fn list_files( ) -> Result, Error> { let client = connect(&repo)?; let client = BackupReader::start( - client, + &client, crypt_config.clone(), repo.store(), &namespace, @@ -430,7 +430,7 @@ async fn extract( let client = connect(&repo)?; let client = BackupReader::start( - client, + &client, crypt_config.clone(), repo.store(), &namespace, diff --git a/src/bin/proxmox_backup_debug/diff.rs b/src/bin/proxmox_backup_debug/diff.rs index 9924fb7b..1c64b27a 100644 --- a/src/bin/proxmox_backup_debug/diff.rs +++ b/src/bin/proxmox_backup_debug/diff.rs @@ -294,7 +294,7 @@ async fn create_backup_reader( }; let client = connect(¶ms.repo)?; let backup_reader = BackupReader::start( - client, + &client, params.crypt_config.clone(), params.repo.store(), ¶ms.namespace, diff --git a/src/server/pull.rs b/src/server/pull.rs index a973a10e..e55452d1 100644 --- a/src/server/pull.rs +++ b/src/server/pull.rs @@ -738,7 +738,7 @@ async fn pull_group( )?; let reader = BackupReader::start( - new_client, + &new_client, None, params.source.store(), &remote_ns, -- 2.39.2