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

re-add server version and version range

Browse Source
This commit is contained in:
Aiden McClelland
2023-06-12 11:24:21 -06:00
committed by Aiden McClelland
parent 1969f036fa
commit d4113ff753
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
backend/src/init.rs
View File

@@ -42,6 +42,8 @@ pub async fn check_time_is_synchronized() -> Result<bool, Error> {
pub struct InitReceipts { pub struct InitReceipts {
pub server_info: LockReceipt<ServerInfo, ()>, pub server_info: LockReceipt<ServerInfo, ()>,
pub server_version: LockReceipt<crate::util::Version, ()>,
pub version_range: LockReceipt<emver::VersionRange, ()>,
} }
impl InitReceipts { impl InitReceipts {
pub async fn new(db: &mut impl DbHandle) -> Result<Self, Error> { pub async fn new(db: &mut impl DbHandle) -> Result<Self, Error> {
@@ -51,10 +53,22 @@ impl InitReceipts {
.server_info() .server_info()
.make_locker(LockType::Write) .make_locker(LockType::Write)
.add_to_keys(&mut locks); .add_to_keys(&mut locks);
let server_version = crate::db::DatabaseModel::new()
.server_info()
.version()
.make_locker(LockType::Write)
.add_to_keys(&mut locks);
let version_range = crate::db::DatabaseModel::new()
.server_info()
.eos_version_compat()
.make_locker(LockType::Write)
.add_to_keys(&mut locks);
let skeleton_key = db.lock_all(locks).await?; let skeleton_key = db.lock_all(locks).await?;
Ok(Self { Ok(Self {
server_info: server_info.verify(&skeleton_key)?, server_info: server_info.verify(&skeleton_key)?,
server_version: server_version.verify(&skeleton_key)?,
version_range: version_range.verify(&skeleton_key)?,
}) })
} }
} }