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

Fix: Fix the issue where the restart after a service install and update,

Browse Source 
would mak
the system crash
This commit is contained in:
J H
2024-03-27 12:40:23 -06:00
parent bcc76dd60a
commit 5698b830ed
5 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/startos/src/service/mod.rs
View File

@@ -12,7 +12,6 @@ use serde::{Deserialize, Serialize};
use start_stop::StartStop;
use tokio::sync::Notify;
use crate::action::ActionResult;
use crate::config::action::ConfigRes;
use crate::context::{CliContext, RpcContext};
use crate::core::rpc_continuations::RequestGuid;
@@ -30,6 +29,7 @@ use crate::status::health_check::HealthCheckResult;
use crate::status::MainStatus;
use crate::util::actor::{Actor, BackgroundJobs, SimpleActor};
use crate::volume::data_dir;
use crate::{action::ActionResult, util::serde::Pem};
pub mod cli;
mod config;
@@ -280,7 +280,7 @@ impl Service {
entry
.as_state_info_mut()
.ser(&PackageState::Installed(InstalledState { manifest }))?;
entry.as_developer_key_mut().ser(&developer_key)?;
entry.as_developer_key_mut().ser(&Pem::new(developer_key))?;
entry.as_icon_mut().ser(&icon)?;
// TODO: marketplace url
// TODO: dependency info

4
core/startos/src/service/service_map.rs
View File

@@ -10,7 +10,6 @@ use imbl_value::InternedString;
use tokio::sync::{Mutex, OwnedRwLockReadGuard, OwnedRwLockWriteGuard, RwLock};
use tracing::instrument;
use crate::context::RpcContext;
use crate::db::model::package::{
InstallingInfo, InstallingState, PackageDataEntry, PackageState, UpdatingState,
};
@@ -27,6 +26,7 @@ use crate::s9pk::merkle_archive::source::FileSource;
use crate::s9pk::S9pk;
use crate::service::{LoadDisposition, Service};
use crate::status::{MainStatus, Status};
use crate::{context::RpcContext, util::serde::Pem};
pub type DownloadInstallFuture = BoxFuture<'static, Result<InstallFuture, Error>>;
pub type InstallFuture = BoxFuture<'static, Result<(), Error>>;
@@ -167,7 +167,7 @@ impl ServiceMap {
dependency_config_errors: Default::default(),
},
marketplace_url: None,
developer_key,
developer_key: Pem::new(developer_key),
icon,
last_backup: None,
dependency_info: Default::default(),