open.source/espanso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(core): fix missing parameter on Unix

Browse Source
This commit is contained in:
Federico Terzi 2021-10-09 16:07:23 +02:00
parent 3c455b6d4b
commit fa139a426b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
espanso/src/cli/service/mod.rs
View File

@ -17,7 +17,7 @@
* along with espanso. If not, see <https://www.gnu.org/licenses/>. * along with espanso. If not, see <https://www.gnu.org/licenses/>.
*/ */
use super::{CliModule, CliModuleArgs}; use super::{CliModule, CliModuleArgs, PathsOverrides};
use crate::{ use crate::{
error_eprintln, error_eprintln,
exit_code::{ exit_code::{
@ -92,18 +92,18 @@ fn service_main(args: CliModuleArgs) -> i32 {
return SERVICE_NOT_REGISTERED; return SERVICE_NOT_REGISTERED;
} }
} else if let Some(sub_args) = cli_args.subcommand_matches("start") { } else if let Some(sub_args) = cli_args.subcommand_matches("start") {
return start_main(&paths, sub_args); return start_main(&paths, &paths_overrides, sub_args);
} else if cli_args.subcommand_matches("stop").is_some() { } else if cli_args.subcommand_matches("stop").is_some() {
return stop_main(&paths); return stop_main(&paths);
} else if let Some(sub_args) = cli_args.subcommand_matches("restart") { } else if let Some(sub_args) = cli_args.subcommand_matches("restart") {
stop_main(&paths); stop_main(&paths);
return start_main(&paths, sub_args); return start_main(&paths, &paths_overrides, sub_args);
} }
SERVICE_SUCCESS SERVICE_SUCCESS
} }
fn start_main(paths: &Paths, args: &ArgMatches) -> i32 { fn start_main(paths: &Paths, _paths_overrides: &PathsOverrides, args: &ArgMatches) -> i32 {
let lock_file = acquire_worker_lock(&paths.runtime); let lock_file = acquire_worker_lock(&paths.runtime);
if lock_file.is_none() { if lock_file.is_none() {
error_eprintln!("espanso is already running!"); error_eprintln!("espanso is already running!");
@ -115,7 +115,7 @@ fn start_main(paths: &Paths, args: &ArgMatches) -> i32 {
// Unmanaged service // Unmanaged service
#[cfg(unix)] #[cfg(unix)]
{ {
if let Err(err) = fork_daemon(&paths_overrides) { if let Err(err) = fork_daemon(&_paths_overrides) {
error_eprintln!("unable to start service (unmanaged): {}", err); error_eprintln!("unable to start service (unmanaged): {}", err);
return SERVICE_FAILURE; return SERVICE_FAILURE;
} }