diff options
author | Matthias Beyer <mail@beyermatthias.de> | 2020-05-18 21:27:30 +0200 |
---|---|---|
committer | Matthias Beyer <mail@beyermatthias.de> | 2020-05-18 21:27:30 +0200 |
commit | c44d69dcde20d6b200f7c2782a4ebbb848e2ed1f (patch) | |
tree | 92f07a1beeddd2b82972616a11670984376a168b /src/main.rs | |
parent | 75dadb51fee37579d5b02005096e0d9e7f26f87c (diff) |
Move app startup code to server part
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Diffstat (limited to 'src/main.rs')
-rw-r--r-- | src/main.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/main.rs b/src/main.rs index 6575203..b624bd8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -93,18 +93,18 @@ async fn main() -> Result<()> { let start_server = crate::server::do_start(&cli); match (server_running, start_server) { - (true, false) => crate::gui::run_gui(config, adr), + (true, false) => crate::gui::run_gui(adr), (false, false) => { // fork() info!("Spawning server thread..."); let path = std::env::current_exe()?; let mut child = std::process::Command::new(path).arg("server").spawn()?; - let r = crate::gui::run_gui(config, adr); + let r = crate::gui::run_gui(adr); child.kill()?; r }, - (false, true) => crate::server::run_server(server_lock, adr).await, + (false, true) => crate::server::run_server(config, server_lock, adr).await, (true, true) => { info!("Server is already running. Doing nothing."); |