ForgeFlux/starchart
2
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

fix: don't kill introducer immediately; wait for server to exit

Browse source
This commit is contained in:
Aravinth Manivannan 2023-03-25 21:29:23 +05:30
parent c1c55ec7f3
commit 1ebb18b884
Signed by: realaravinth
GPG key ID: AD9F0F08E855ED88
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main.rs
View file

@ -97,7 +97,7 @@ async fn main() {
let f = federate.clone(); let f = federate.clone();
let socket_addr = settings.server.get_ip(); let socket_addr = settings.server.get_ip();
let server_fut = HttpServer::new(move || { HttpServer::new(move || {
App::new() App::new()
.wrap(middleware::Logger::default()) .wrap(middleware::Logger::default())
.wrap(middleware::Compress::default()) .wrap(middleware::Compress::default())
@ -112,11 +112,11 @@ async fn main() {
}) })
.bind(&socket_addr) .bind(&socket_addr)
.unwrap() .unwrap()
.run(); .run()
// .await .await
// .unwrap(); .unwrap();
let s = tokio::spawn(server_fut); // let s = tokio::spawn(server_fut);
// f.import( // f.import(
// url::Url::parse("http://localhost:7000").unwrap(), // url::Url::parse("http://localhost:7000").unwrap(),
// &c.client, // &c.client,
@ -128,5 +128,4 @@ async fn main() {
kill_introducer.send(true).unwrap(); kill_introducer.send(true).unwrap();
crawler_fut.await.unwrap().await; crawler_fut.await.unwrap().await;
introducer_fut.await; introducer_fut.await;
s.await.unwrap().unwrap();
} }