tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bin: daily-update: make single checks/updates fail gracefully

Browse Source 
avoid that the acme renewal is skipped due to bailing out earlier
from a subscription or apt update error.

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2022-02-22 10:26:59 +01:00
parent 00d41438b9
commit b0728103b6
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/bin/proxmox-daily-update.rs
View File

@ -25,10 +25,14 @@ async fn do_update(rpcenv: &mut dyn RpcEnvironment) -> Result<(), Error> {
let param = json!({}); let param = json!({});
let method = &api2::node::subscription::API_METHOD_CHECK_SUBSCRIPTION; let method = &api2::node::subscription::API_METHOD_CHECK_SUBSCRIPTION;
let _res = match method.handler { match method.handler {
ApiHandler::Sync(handler) => (handler)(param, method, rpcenv)?, ApiHandler::Sync(handler) => {
if let Err(err) = (handler)(param, method, rpcenv) {
eprintln!("Error checking subscription - {}", err);
}
}
_ => unreachable!(), _ => unreachable!(),
}; }
let notify = match subscription::read_subscription() { let notify = match subscription::read_subscription() {
Ok(Some(subscription)) => subscription.status == subscription::SubscriptionStatus::ACTIVE, Ok(Some(subscription)) => subscription.status == subscription::SubscriptionStatus::ACTIVE,
@ -43,11 +47,15 @@ async fn do_update(rpcenv: &mut dyn RpcEnvironment) -> Result<(), Error> {
"notify": notify, "notify": notify,
}); });
let method = &api2::node::apt::API_METHOD_APT_UPDATE_DATABASE; let method = &api2::node::apt::API_METHOD_APT_UPDATE_DATABASE;
let upid = match method.handler { match method.handler {
ApiHandler::Sync(handler) => (handler)(param, method, rpcenv)?, ApiHandler::Sync(handler) => match (handler)(param, method, rpcenv) {
Err(err) => {
eprintln!("Error triggering apt database update - {}", err);
}
Ok(upid) => wait_for_local_worker(upid.as_str().unwrap()).await?,
},
_ => unreachable!(), _ => unreachable!(),
}; };
wait_for_local_worker(upid.as_str().unwrap()).await?;
match check_acme_certificates(rpcenv).await { match check_acme_certificates(rpcenv).await {
Ok(()) => (), Ok(()) => (),