Added stop_actix_web function to stop the server
Removed async from start_actix_web function
This commit is contained in:
parent
47583a7ef8
commit
560095e0a7
2 changed files with 26 additions and 20 deletions
|
@ -2,14 +2,18 @@ use actix_web::HttpServer;
|
|||
|
||||
use crate::api::endpoints::*;
|
||||
|
||||
pub async fn start_actix_web(port: u16) -> std::io::Result<()> {
|
||||
#[allow(dead_code)]
|
||||
pub async fn stop_actix_web(server: actix_web::dev::Server) -> std::io::Result<()> {
|
||||
println!("Stopping server.");
|
||||
server.handle().stop(true).await;
|
||||
Ok(())
|
||||
}
|
||||
|
||||
//std::env::set_var("RUST_LOG", "debug");
|
||||
//std::env::set_var("RUST_BACKTRACE", "1");
|
||||
pub fn start_actix_web(port: u16) -> std::io::Result<actix_web::dev::Server> {
|
||||
|
||||
println!("Starting webserver on 127.0.0.1:{}", port);
|
||||
|
||||
HttpServer::new(move || {
|
||||
let server = HttpServer::new(move || {
|
||||
let logger = actix_web::middleware::Logger::default();
|
||||
actix_web::App::new()
|
||||
.wrap(logger)
|
||||
|
@ -21,6 +25,7 @@ pub async fn start_actix_web(port: u16) -> std::io::Result<()> {
|
|||
.service(get_dock_info)
|
||||
})
|
||||
.bind(("127.0.0.1", port))?
|
||||
.run()
|
||||
.await
|
||||
.run();
|
||||
|
||||
Ok(server)
|
||||
}
|
27
src/main.rs
27
src/main.rs
|
@ -12,25 +12,26 @@ static PORT: u16 = 9000;
|
|||
static USE_FALLBACK_DOCK_DETECTION: bool = false;
|
||||
|
||||
fn main() {
|
||||
let version_info = Version::get();
|
||||
|
||||
println!("Version: {}", version_info.version);
|
||||
println!("Build Timestamp: {}", version_info.build_timestamp);
|
||||
println!("Git Branch: {}", version_info.git_branch);
|
||||
println!("Git Describe: {}", version_info.git_describe);
|
||||
println!("Git Commit Timestamp: {}", version_info.git_commit_timestamp);
|
||||
println!("Debug Build: {}", version_info.debug);
|
||||
println!("\n\n");
|
||||
//#[cfg(debug_assertions)]
|
||||
{
|
||||
let version_info = Version::get();
|
||||
println!("Version: {}", version_info.version);
|
||||
println!("Build Timestamp: {}", version_info.build_timestamp);
|
||||
println!("Git Branch: {}", version_info.git_branch);
|
||||
println!("Git Describe: {}", version_info.git_describe);
|
||||
println!("Git Commit Timestamp: {}", version_info.git_commit_timestamp);
|
||||
println!("Debug Build: {}", version_info.debug);
|
||||
println!("\n\n");
|
||||
}
|
||||
|
||||
println!("HarmonyLink ©️ Jordon Brooks 2023");
|
||||
|
||||
|
||||
let sys = actix_web::rt::System::new();
|
||||
sys.block_on(async {
|
||||
let result = api::server::start_actix_web (PORT).await;
|
||||
match result {
|
||||
Ok(_) => println!("Webserver started successfully."),
|
||||
Err(e) => println!("Error starting actix_web: {}", e),
|
||||
}
|
||||
let result = api::server::start_actix_web(PORT).expect("err");
|
||||
|
||||
let _ = result.await;
|
||||
});
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue