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 7D1F3650B3 for ; Mon, 2 Nov 2020 12:34:42 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 56DBB2289E for ; Mon, 2 Nov 2020 12:34:42 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 8D6C422884 for ; Mon, 2 Nov 2020 12:34:40 +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 5013245DA0 for ; Mon, 2 Nov 2020 12:34:40 +0100 (CET) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Mon, 2 Nov 2020 12:34:37 +0100 Message-Id: <20201102113439.26618-4-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201102113439.26618-1-d.csapak@proxmox.com> References: <20201102113439.26618-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.422 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup 3/5] server/gc_job: add 'to_stdout' 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: Mon, 02 Nov 2020 11:34:42 -0000 we will use this for the manual api call Signed-off-by: Dominik Csapak --- src/bin/proxmox-backup-proxy.rs | 2 +- src/server/gc_job.rs | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs index 39254504..8d28aecb 100644 --- a/src/bin/proxmox-backup-proxy.rs +++ b/src/bin/proxmox-backup-proxy.rs @@ -329,7 +329,7 @@ async fn schedule_datastore_garbage_collection() { let auth_id = Authid::backup_auth_id(); - if let Err(err) = crate::server::do_garbage_collection_job(job, datastore, auth_id, Some(event_str)) { + if let Err(err) = crate::server::do_garbage_collection_job(job, datastore, auth_id, Some(event_str), false) { eprintln!("unable to start garbage collection job on datastore {} - {}", store, err); } } diff --git a/src/server/gc_job.rs b/src/server/gc_job.rs index dabbb237..0128a33e 100644 --- a/src/server/gc_job.rs +++ b/src/server/gc_job.rs @@ -14,6 +14,7 @@ pub fn do_garbage_collection_job( datastore: Arc, auth_id: &Authid, schedule: Option, + to_stdout: bool, ) -> Result { let email = crate::server::lookup_user_email(auth_id.user()); @@ -25,7 +26,7 @@ pub fn do_garbage_collection_job( &worker_type, Some(store.clone()), auth_id.clone(), - false, + to_stdout, move |worker| { job.start(&worker.upid().to_string())?; -- 2.20.1