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

appmgr: fix locking for app status repair

Browse Source
This commit is contained in:
Aiden McClelland
2020-12-07 17:40:39 -07:00
committed by Keagan McClelland
parent bcfe7c0d21
commit e4cbc38bfd
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
appmgr/src/control.rs
View File

@@ -207,6 +207,18 @@ pub async fn resume_app(name: &str) -> Result<(), Error> {
} }
pub async fn repair_app_status() -> Result<(), Error> { pub async fn repair_app_status() -> Result<(), Error> {
let lock = crate::util::lock_file(
format!(
"{}",
Path::new(crate::PERSISTENCE_DIR)
.join("apps")
.join(name)
.join("control.lock")
.display()
),
true,
)
.await?;
let running: Vec<String> = if let Some(mut f) = PersistencePath::from_ref("running.yaml") let running: Vec<String> = if let Some(mut f) = PersistencePath::from_ref("running.yaml")
.maybe_read(false) .maybe_read(false)
.await .await
@@ -217,22 +229,10 @@ pub async fn repair_app_status() -> Result<(), Error> {
Vec::new() Vec::new()
}; };
for name in running { for name in running {
let lock = crate::util::lock_file(
format!(
"{}",
Path::new(crate::PERSISTENCE_DIR)
.join("apps")
.join(&name)
.join("control.lock")
.display()
),
true,
)
.await?;
if crate::apps::status(&name, false).await?.status == crate::apps::DockerStatus::Stopped { if crate::apps::status(&name, false).await?.status == crate::apps::DockerStatus::Stopped {
start_app(&name, true).await?; start_app(&name, true).await?;
} }
crate::util::unlock(lock).await?;
} }
crate::util::unlock(lock).await?;
Ok(()) Ok(())
} }