Fix disconnecting players that never acknowledge an update

vladbat00 · Jan 23, 2023 · 77bc001 · 77bc001
1 parent e1957f4
commit 77bc001
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/libs/server_lib/src/lib.rs b/libs/server_lib/src/lib.rs
@@ -58,7 +58,7 @@ mod net;
 mod persistence;
 mod player_updates;
 
-pub const DEFAULT_IDLE_TIMEOUT: u64 = 300_000;
+pub const DEFAULT_IDLE_TIMEOUT_MILLIS: u64 = 300_000;
 
 #[derive(Resource)]
 pub struct Agones {
@@ -209,9 +209,9 @@ impl Plugin for MuddleServerPlugin {
                     .unwrap_or_else(|| {
                         log::info!(
                             "Using the default value for MUDDLE_IDLE_TIMEOUT: {}",
-                            DEFAULT_IDLE_TIMEOUT
+                            DEFAULT_IDLE_TIMEOUT_MILLIS
                         );
-                        Duration::from_millis(DEFAULT_IDLE_TIMEOUT)
+                        Duration::from_millis(DEFAULT_IDLE_TIMEOUT_MILLIS)
                     }),
             )
         });

diff --git a/libs/server_lib/src/net.rs b/libs/server_lib/src/net.rs
@@ -382,7 +382,7 @@ pub fn process_network_events(
                         if let Err(err) = connection_state
                             .apply_outgoing_acknowledgements(frame_number, ack_bit_set)
                         {
-                            log::debug!(
+                            log::trace!(
                                 "Failed to apply outgoing packet acknowledgments (player: {}, update frame: {}, current frame: {}): {:?}",
                                 player_net_id.0,
                                 update.frame_number,
@@ -717,7 +717,7 @@ fn disconnect_players(
                     .set_status(ConnectionStatus::Disconnecting(DisconnectReason::Timeout));
             }
         } else if Instant::now().duration_since(connection_state.status_updated_at())
-            > Duration::from_secs(CONNECTION_TIMEOUT_MILLIS)
+            > Duration::from_millis(CONNECTION_TIMEOUT_MILLIS)
         {
             // Disconnect players that haven't sent any updates at all (they are likely
             // in the `Connecting` or `Handshaking` status) if they are staying in this
@@ -729,7 +729,7 @@ fn disconnect_players(
         // Disconnecting players that haven't sent any message for
         // `CONNECTION_TIMEOUT_MILLIS`.
         if Instant::now().duration_since(connection_state.last_valid_message_received_at)
-            > Duration::from_secs(CONNECTION_TIMEOUT_MILLIS)
+            > Duration::from_millis(CONNECTION_TIMEOUT_MILLIS)
         {
             log::warn!("Disconnecting {}: idle", handle);
             connection_state.set_status(ConnectionStatus::Disconnecting(DisconnectReason::Timeout));
@@ -1169,7 +1169,7 @@ fn create_player_state(
         .get_with_extrapolation(updates_start_frame)
         .map(|(_frame_number, direction)| *direction)
         .unwrap_or_else(|| {
-            log::debug!(
+            log::trace!(
                 "Missing updates for Player {} (updates start frame: {}, last player direction frame: {:?})",
                 net_id.0,
                 updates_start_frame,

diff --git a/libs/shared_lib/src/framebuffer.rs b/libs/shared_lib/src/framebuffer.rs
@@ -261,7 +261,7 @@ impl<T> Framebuffer<Option<T>> {
                 )
             });
         if result.is_none() {
-            log::warn!(
+            log::trace!(
                 "No value found to extrapolate for frame {} (start_frame: {}, limit: {})",
                 frame_number.value(),
                 self.start_frame.value(),

diff --git a/libs/utils_lib/src/jwks.rs b/libs/utils_lib/src/jwks.rs
@@ -11,7 +11,7 @@ use reqwest::Url;
 use serde::{Deserialize, Serialize};
 use std::{convert::TryFrom, time::Duration};
 
-pub const DEFAULT_JWK_CACHE_TTL: u64 = 15;
+pub const DEFAULT_JWK_CACHE_TTL_SECS: u64 = 15;
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]
 pub struct JwkSet<'a> {
@@ -131,10 +131,10 @@ pub async fn poll_jwks(client: reqwest::Client, certs_url: Url, jwks: Jwks) {
                 let jwk_ttl = max_age.unwrap_or_else(|err| {
                     log::error!(
                         "Unable to determine cache TTL (will invalidate in {} seconds): {:?}",
-                        DEFAULT_JWK_CACHE_TTL,
+                        DEFAULT_JWK_CACHE_TTL_SECS,
                         err
                     );
-                    Duration::from_secs(DEFAULT_JWK_CACHE_TTL)
+                    Duration::from_secs(DEFAULT_JWK_CACHE_TTL_SECS)
                 });
 
                 match response.json::<JwkSet>().await {
@@ -162,10 +162,10 @@ pub async fn poll_jwks(client: reqwest::Client, certs_url: Url, jwks: Jwks) {
             Err(err) => {
                 log::error!(
                     "Failed to fetch JwtSet (will re-try in {} seconds): {:?}",
-                    DEFAULT_JWK_CACHE_TTL,
+                    DEFAULT_JWK_CACHE_TTL_SECS,
                     err
                 );
-                Duration::from_secs(DEFAULT_JWK_CACHE_TTL)
+                Duration::from_secs(DEFAULT_JWK_CACHE_TTL_SECS)
             }
         };