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 78F30907FD for ; Thu, 22 Sep 2022 15:37:58 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 5B33A19B9A for ; Thu, 22 Sep 2022 15:37:58 +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 ; Thu, 22 Sep 2022 15:37:57 +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 916864457F for ; Thu, 22 Sep 2022 15:37:57 +0200 (CEST) From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= To: pbs-devel@lists.proxmox.com Date: Thu, 22 Sep 2022 15:37:52 +0200 Message-Id: <20220922133752.3367660-1-f.gruenbichler@proxmox.com> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.147 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. [proxmox-daily-update.rs] Subject: [pbs-devel] [PATCH proxmox-backup] daily update: fix subscription check 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: Thu, 22 Sep 2022 13:37:58 -0000 this wrongly triggered for non-subscribed systems as well. Fixes: dd16e1dac8976b523c1cf895efe280b73008eca6 Signed-off-by: Fabian Grünbichler --- src/bin/proxmox-daily-update.rs | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/src/bin/proxmox-daily-update.rs b/src/bin/proxmox-daily-update.rs index 32c1d1ee..5332e217 100644 --- a/src/bin/proxmox-daily-update.rs +++ b/src/bin/proxmox-daily-update.rs @@ -2,6 +2,7 @@ use anyhow::Error; use serde_json::json; use proxmox_router::{cli::*, ApiHandler, RpcEnvironment}; +use proxmox_subscription::SubscriptionStatus; use proxmox_sys::fs::CreateOptions; use proxmox_backup::api2; @@ -32,16 +33,12 @@ async fn do_update(rpcenv: &mut dyn RpcEnvironment) -> Result<(), Error> { } _ => unreachable!(), } - let method = &api2::node::subscription::API_METHOD_GET_SUBSCRIPTION; - let notify = match method.handler { - ApiHandler::Sync(handler) => match (handler)(param, method, rpcenv) { - Ok(value) => !value.is_null(), - Err(err) => { - log::error!("Error reading subscription - {}", err); - false - } + let notify = match api2::node::subscription::get_subscription(param, rpcenv) { + Ok(info) => info.status == SubscriptionStatus::Active, + Err(err) => { + log::error!("Error reading subscription - {}", err); + false }, - _ => unreachable!(), }; let param = json!({ -- 2.30.2