[pbs-devel] [PATCH proxmox-backup] daily update: fix subscription check

[pbs-devel] [PATCH proxmox-backup] daily update: fix subscription check

[Fabian Grünbichler]

this wrongly triggered for non-subscribed systems as well.

Fixes: dd16e1dac8976b523c1cf895efe280b73008eca6

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
---
 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

[pbs-devel] applied: [PATCH proxmox-backup] daily update: fix subscription check

[Thomas Lamprecht]

Am 22/09/2022 um 15:37 schrieb Fabian Grünbichler:
> this wrongly triggered for non-subscribed systems as well.
> 
> Fixes: dd16e1dac8976b523c1cf895efe280b73008eca6
> 
> Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
> ---
>  src/bin/proxmox-daily-update.rs | 15 ++++++---------
>  1 file changed, 6 insertions(+), 9 deletions(-)
> 
>

applied, thanks!