From 37cfd7b336ff78c02dd789388d53a938f0e77399 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fabian=20Gr=C3=BCnbichler?= Date: Thu, 22 Sep 2022 15:37:52 +0200 Subject: [PATCH] daily update: fix subscription check MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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.39.5