修复windows服务不能自启动的问题
This commit is contained in:
lubeilin
@@ -3,7 +3,9 @@
|
||||
|
||||
use std::ffi::OsString;
|
||||
use std::sync::Arc;
|
||||
use std::thread;
|
||||
use std::io;
|
||||
use std::io::Write;
|
||||
use std::path::PathBuf;
|
||||
use std::time::Duration;
|
||||
use clap::Parser;
|
||||
|
||||
@@ -15,36 +17,26 @@ use windows_service::service_control_handler::ServiceControlHandlerResult;
|
||||
|
||||
use switch::core::{Config, Switch};
|
||||
|
||||
use crate::{BaseArgs, Commands, config, StartArgs};
|
||||
use crate::{BaseArgs, Commands, config};
|
||||
use crate::windows::SERVICE_NAME;
|
||||
|
||||
define_windows_service!(ffi_service_main, switch_service_main);
|
||||
pub fn switch_service_main(arguments: Vec<OsString>) {
|
||||
let base_args = BaseArgs::parse_from(arguments);
|
||||
match base_args.command {
|
||||
Commands::Start(args) => {
|
||||
if args.log {
|
||||
let _ = config::log_config::log_service_init();
|
||||
tokio::runtime::Builder::new_multi_thread()
|
||||
.enable_all()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block_on(async {
|
||||
match service_main(arguments).await {
|
||||
Ok(_) => {}
|
||||
Err(e) => {
|
||||
log::error!("启动服务失败：{:?}",e);
|
||||
}
|
||||
}
|
||||
tokio::runtime::Builder::new_multi_thread()
|
||||
.enable_all()
|
||||
.build()
|
||||
.unwrap()
|
||||
.block_on(async {
|
||||
match service_main(args).await {
|
||||
Ok(_) => {}
|
||||
Err(e) => {
|
||||
log::error!("启动服务失败：{:?}",e);
|
||||
}
|
||||
}
|
||||
})
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
async fn service_main(args: StartArgs) -> windows_service::Result<()> {
|
||||
log::info!("service_main：{:?}",args);
|
||||
async fn service_main(arguments: Vec<OsString>) -> windows_service::Result<()> {
|
||||
let parker = crossbeam::sync::Parker::new();
|
||||
let un_parker = parker.unparker().clone();
|
||||
let event_handler = move |control_event| -> ServiceControlHandlerResult {
|
||||
@@ -78,15 +70,13 @@ async fn service_main(args: StartArgs) -> windows_service::Result<()> {
|
||||
wait_hint: Duration::default(),
|
||||
process_id: None,
|
||||
})?;
|
||||
match start_switch(args).await {
|
||||
Ok(switch) => {
|
||||
match start_switch(arguments).await {
|
||||
Ok(_) => {
|
||||
parker.park();
|
||||
if let Err(e) = switch.stop() {
|
||||
log::warn!("switch stop:{:?}",e)
|
||||
}
|
||||
|
||||
}
|
||||
Err(e) => {
|
||||
log::error!("{:?}",e);
|
||||
log::error!("服务启动失败 {:?}",e);
|
||||
}
|
||||
}
|
||||
status_handle.set_service_status(ServiceStatus {
|
||||
@@ -100,25 +90,76 @@ async fn service_main(args: StartArgs) -> windows_service::Result<()> {
|
||||
})
|
||||
}
|
||||
|
||||
async fn start_switch(args: StartArgs) -> switch::Result<Arc<Switch>> {
|
||||
let start_config = if let Some(config_path) = &args.config {
|
||||
match config::read_config_file(config_path.into()) {
|
||||
Ok(start_config) => {
|
||||
start_config
|
||||
}
|
||||
Err(e) => {
|
||||
log::error!("{:?}", e);
|
||||
return Err(switch::error::Error::Stop(e));
|
||||
fn auto_config_path() -> io::Result<PathBuf> {
|
||||
Ok(config::get_win_server_home().join("auto_config.yaml"))
|
||||
}
|
||||
|
||||
fn save_auto_config(start_config: config::StartConfig) -> io::Result<()> {
|
||||
let mut file = std::fs::File::create(auto_config_path()?)?;
|
||||
log::error!("auto_config_path()? {:?}",auto_config_path()?);
|
||||
let config = config::ArgsConfig::new(start_config);
|
||||
match serde_yaml::to_string(&config) {
|
||||
Ok(yaml) => {
|
||||
file.write_all(yaml.as_bytes())
|
||||
}
|
||||
Err(e) => {
|
||||
Err(io::Error::new(io::ErrorKind::Other, format!("{:?}", e)))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
async fn start_switch(arguments: Vec<OsString>) -> switch::Result<()> {
|
||||
let start_config = match BaseArgs::try_parse_from(arguments) {
|
||||
Ok(args) => {
|
||||
match args.command {
|
||||
Commands::Start(args) => {
|
||||
if args.log {
|
||||
let _ = config::log_config::log_service_init();
|
||||
}
|
||||
if let Some(config_path) = &args.config {
|
||||
match config::read_config_file(config_path.into()) {
|
||||
Ok(start_config) => {
|
||||
if let Err(e) = save_auto_config(start_config.clone()) {
|
||||
log::warn!("配置文件保存失败:{:?}",e);
|
||||
}
|
||||
start_config
|
||||
}
|
||||
Err(e) => {
|
||||
log::error!("{:?}", e);
|
||||
return Err(switch::error::Error::Stop(e));
|
||||
}
|
||||
}
|
||||
} else {
|
||||
match config::default_config(args) {
|
||||
Ok(start_config) => {
|
||||
if let Err(e) = save_auto_config(start_config.clone()) {
|
||||
log::warn!("配置文件保存失败:{:?}",e);
|
||||
}
|
||||
start_config
|
||||
}
|
||||
Err(e) => {
|
||||
log::error!("{:?}", e);
|
||||
return Err(switch::error::Error::Stop(e));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
_ => {
|
||||
return Err(switch::error::Error::Stop("配置文件错误".to_string()));
|
||||
}
|
||||
}
|
||||
}
|
||||
} else {
|
||||
match config::default_config(args) {
|
||||
Ok(start_config) => {
|
||||
start_config
|
||||
}
|
||||
Err(e) => {
|
||||
log::error!("{:?}", e);
|
||||
return Err(switch::error::Error::Stop(e));
|
||||
Err(_) => {
|
||||
match config::read_config_file(auto_config_path()?) {
|
||||
Ok(start_config) => {
|
||||
if start_config.log {
|
||||
let _ = config::log_config::log_service_init();
|
||||
}
|
||||
start_config
|
||||
}
|
||||
Err(e) => {
|
||||
return Err(switch::error::Error::Stop(e));
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
@@ -132,20 +173,28 @@ async fn start_switch(args: StartArgs) -> switch::Result<Arc<Switch>> {
|
||||
start_config.in_ips,
|
||||
start_config.out_ips,
|
||||
);
|
||||
let switch = Switch::start(config).await?;
|
||||
log::info!("switch-service服务启动");
|
||||
let switch = Arc::new(switch);
|
||||
let command_server = crate::command::server::CommandServer::new();
|
||||
let switch1 = switch.clone();
|
||||
thread::spawn(move || {
|
||||
if let Err(e) = config::update_pid(std::process::id()) {
|
||||
log::error!("{:?}", e);
|
||||
}
|
||||
if let Err(e) = command_server.start(switch1) {
|
||||
log::error!("{:?}", e);
|
||||
}
|
||||
|
||||
|
||||
tokio::spawn(async move {
|
||||
match Switch::start(config).await {
|
||||
Ok(switch) => {
|
||||
let switch = Arc::new(switch);
|
||||
let command_server = crate::command::server::CommandServer::new();
|
||||
if let Err(e) = config::update_pid(std::process::id()) {
|
||||
log::error!("{:?}", e);
|
||||
}
|
||||
if let Err(e) = command_server.start(switch) {
|
||||
log::error!("{:?}", e);
|
||||
}
|
||||
}
|
||||
Err(e) => {
|
||||
log::error!("{:?}", e);
|
||||
}
|
||||
};
|
||||
|
||||
});
|
||||
Ok(switch)
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn start() {
|
||||
|
||||
Reference in New Issue
Block a user