Start9/start-os
2
0
Fork 0
mirror of https://github.com/Start9Labs/start-os.git synced 2026-03-30 12:11:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix HasModel for ServerInfo

Browse Source
This commit is contained in:
Aiden McClelland
2021-10-08 16:58:30 -06:00
committed by Aiden McClelland
parent f4b70f653f
commit ee8eca7038
2 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
appmgr/src/update/mod.rs
View File

@@ -165,12 +165,11 @@ async fn maybe_do_update(ctx: RpcContext) -> Result<Option<Arc<Revision>>, Error
}
let mut db = ctx.db.handle();
let mut tx = db.begin().await?;
let mut status = crate::db::DatabaseModel::new()
let mut info = crate::db::DatabaseModel::new()
.server_info()
.status()
.get_mut(&mut tx)
.await?;
match &*status {
match &info.status {
ServerStatus::Updating { .. } => {
return Err(Error::new(
anyhow!("Server is already updating!"),
@@ -197,13 +196,12 @@ async fn maybe_do_update(ctx: RpcContext) -> Result<Option<Arc<Revision>>, Error
new_label,
)
.await?;
*status = ServerStatus::Updating {
update_progress: UpdateProgress {
size,
downloaded: 0,
},
};
status.save(&mut tx).await?;
info.status = ServerStatus::Updating;
info.update_progress = Some(UpdateProgress {
size,
downloaded: 0,
});
info.save(&mut tx).await?;
let rev = tx.commit(None).await?;
tokio::spawn(async move {
@@ -211,19 +209,14 @@ async fn maybe_do_update(ctx: RpcContext) -> Result<Option<Arc<Revision>>, Error
Ok(()) => todo!("issue notification"),
Err(e) => {
let mut db = ctx.db.handle();
let mut status = crate::db::DatabaseModel::new()
let mut info = crate::db::DatabaseModel::new()
.server_info()
.status()
.get_mut(&mut db)
.await
.expect("could not access status");
*status = ServerStatus::Updating {
update_progress: UpdateProgress {
size,
downloaded: 0,
},
};
status.save(&mut db).await.expect("could not save status");
info.status = ServerStatus::Running;
info.update_progress = None;
info.save(&mut db).await.expect("could not save status");
todo!("{}, issue notification", e)
}