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

Merge branch 'integration/0.3.0' of github.com:Start9Labs/embassy-os into integration/0.3.0

Browse Source
This commit is contained in:
Matt Hill
2021-09-23 17:42:05 -06:00
parent 55c9ad0bc2 61ed0a8a58
commit 3c234d29f2
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
appmgr/src/context/cli.rs
View File

@@ -41,9 +41,14 @@ pub struct CliContextSeed {
impl Drop for CliContextSeed { impl Drop for CliContextSeed {
fn drop(&mut self) { fn drop(&mut self) {
let tmp = format!("{}.tmp", self.cookie_path.display()); let tmp = format!("{}.tmp", self.cookie_path.display());
let mut writer = File::create(&tmp).unwrap(); let mut writer = fd_lock_rs::FdLock::lock(
File::create(&tmp).unwrap(),
fd_lock_rs::LockType::Exclusive,
true,
)
.unwrap();
let store = self.cookie_store.lock().unwrap(); let store = self.cookie_store.lock().unwrap();
store.save_json(&mut writer).unwrap(); store.save_json(&mut *writer).unwrap();
writer.sync_all().unwrap(); writer.sync_all().unwrap();
std::fs::rename(tmp, &self.cookie_path).unwrap(); std::fs::rename(tmp, &self.cookie_path).unwrap();
} }

2
appmgr/src/db/mod.rs
View File

@@ -193,6 +193,6 @@ pub async fn ui(
let ptr = "/ui".parse::<JsonPointer>()? + &pointer; let ptr = "/ui".parse::<JsonPointer>()? + &pointer;
Ok(WithRevision { Ok(WithRevision {
response: (), response: (),
revision: Some(ctx.db.put(&ptr, &value, None).await?), revision: ctx.db.put(&ptr, &value, None).await?,
}) })
} }