diff options
Diffstat (limited to 'src/main.rs')
| -rw-r--r-- | src/main.rs | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/src/main.rs b/src/main.rs index fc0f560..2534b40 100644 --- a/src/main.rs +++ b/src/main.rs @@ -2,28 +2,31 @@ extern crate log; use mio::net::TcpListener; +use std::thread; use whirl::server; fn main() { dotenv::dotenv().ok(); // Adds ability to use environment variables. pretty_env_logger::init(); // Adds pretty logging. - std::thread::spawn(|| { - server::world::WorldServer::new( + let mut threads = vec![]; + threads.push(thread::spawn(move || { + debug!("spawned WorldServer thread"); + server::world::server::WorldServer::new( TcpListener::bind( &"0.0.0.0:6650".parse().unwrap() ).unwrap() ); - }).join().unwrap(); - debug!("spawned WorldServer thread"); - - // POC, unimplemented. - // std::thread::spawn(move || { - // server::auto::AutoServer::new( - // TcpListener::bind( - // &"0.0.0.0:1337".parse().unwrap() - // ).unwrap() - // ); - // }); - // debug!("spawned AutoServer thread"); + })); + threads.push(thread::spawn(move || { + debug!("spawned AutoServer thread"); + server::auto::server::AutoServer::new( + TcpListener::bind( + &"0.0.0.0:5673".parse().unwrap() + ).unwrap() + ); + })); + for thread in threads { + let _ = thread.join(); + } } |