fix: streamline service availability checks and improve logging for core startup

This commit is contained in:
Tunglies
2025-08-31 16:19:31 +08:00
parent 4508d062f1
commit 9110955b63

View File

@@ -1070,8 +1070,11 @@ impl CoreManager {
service::reinstall_service().await?; service::reinstall_service().await?;
} }
logging!(info, Type::Core, true, "服务可用,使用服务模式启动"); logging!(info, Type::Core, true, "服务可用,使用服务模式启动");
self.stop_core_by_service().await?;
self.start_core_by_service().await?; self.start_core_by_service().await?;
} else { return Ok(());
};
// 服务不可用,检查用户偏好 // 服务不可用,检查用户偏好
let service_state = service::ServiceState::get().await; let service_state = service::ServiceState::get().await;
if service_state.prefer_sidecar { if service_state.prefer_sidecar {
@@ -1086,7 +1089,6 @@ impl CoreManager {
logging!(info, Type::Core, true, "服务不可用使用Sidecar模式"); logging!(info, Type::Core, true, "服务不可用使用Sidecar模式");
self.start_core_by_sidecar().await?; self.start_core_by_sidecar().await?;
} }
}
Ok(()) Ok(())
} }
@@ -1102,7 +1104,6 @@ impl CoreManager {
/// 重启内核 /// 重启内核
pub async fn restart_core(&self) -> Result<()> { pub async fn restart_core(&self) -> Result<()> {
self.stop_core().await?; self.stop_core().await?;
self.start_core().await?; self.start_core().await?;
Ok(()) Ok(())
} }