- update: moved signal handler into utils crate to make it easier to update
- fix: windows compile issue due to exposed unix signal
This commit is contained in:
@@ -110,7 +110,6 @@ pub(crate) async fn handle_delete_char_req(stream: &mut TcpStream, packet: Packe
|
||||
}
|
||||
|
||||
let mut character_client = character_client.lock().await;
|
||||
// character_client.delete_character(request.is_delete, request.char_id, request.name);
|
||||
character_client.delete_character(&user_id.to_string(), &request.char_id.to_string());
|
||||
|
||||
let character_name = request.name;
|
||||
@@ -134,7 +133,7 @@ pub(crate) async fn handle_select_char_req(stream: &mut TcpStream, packet: Packe
|
||||
}
|
||||
|
||||
let mut character_client = character_client.lock().await;
|
||||
// character_client.get_character(&user_id.to_string(), request.char_id);
|
||||
character_client.get_character(&user_id.to_string(), request.char_id);
|
||||
let mut equipped_item_list: [EquippedItem; (MAX_VISIBLE_ITEMS as usize)] = core::array::from_fn(|i| EquippedItem::default());
|
||||
let mut effect_list: [StatusEffect; (MAX_STATUS_EFFECTS as usize)] = core::array::from_fn(|i| StatusEffect::default());
|
||||
let mut hotbar_list: [HotbarItem; (MAX_HOTBAR_ITEMS as usize)] = core::array::from_fn(|i| HotbarItem::default());
|
||||
|
||||
@@ -131,15 +131,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
|
||||
}
|
||||
});
|
||||
|
||||
let mut sigterm_stream = signal::unix::signal(signal::unix::SignalKind::terminate())?;
|
||||
select! {
|
||||
_ = signal::ctrl_c() => {
|
||||
info!("Received SIGINT (Ctrl+C), shutting down...");
|
||||
},
|
||||
_ = sigterm_stream.recv() => {
|
||||
info!("Received SIGTERM, shutting down...");
|
||||
},
|
||||
}
|
||||
utils::signal_handler::wait_for_signal().await;
|
||||
|
||||
consul_registration::deregister_service(&consul_url, service_id.as_str()).await.expect("");
|
||||
info!("service {} deregistered", service_name);
|
||||
|
||||
Reference in New Issue
Block a user