From 065823f71e43cf43bfefa2c9b593f4346632ae4b Mon Sep 17 00:00:00 2001 From: Nikhil Narayana Date: Sun, 13 Aug 2023 16:52:07 -0700 Subject: [PATCH] pull in rust updates --- .../SlippiRustExtensions/dolphin/src/logger/mod.rs | 4 ++-- Externals/SlippiRustExtensions/ffi/src/logger.rs | 2 +- .../game-reporter/src/queue.rs | 14 ++++++-------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Externals/SlippiRustExtensions/dolphin/src/logger/mod.rs b/Externals/SlippiRustExtensions/dolphin/src/logger/mod.rs index 091afeab78..7d281637b5 100644 --- a/Externals/SlippiRustExtensions/dolphin/src/logger/mod.rs +++ b/Externals/SlippiRustExtensions/dolphin/src/logger/mod.rs @@ -155,11 +155,11 @@ pub fn update_container(kind: *const c_char, enabled: bool, level: c_int) { pub fn mainline_update_log_level(level: c_int) { let containers = LOG_CONTAINERS .get() - .expect("[dolphin_logger::update_container]: Attempting to get `LOG_CONTAINERS` before init"); + .expect("[dolphin_logger::mainline_update_log_level]: Attempting to get `LOG_CONTAINERS` before init"); let mut writer = containers .write() - .expect("[dolphin_logger::update_container]: Unable to acquire write lock on `LOG_CONTAINERS`?"); + .expect("[dolphin_logger::mainline_update_log_level]: Unable to acquire write lock on `LOG_CONTAINERS`?"); for container in (*writer).iter_mut() { container.level = convert_dolphin_log_level_to_tracing_level(level); diff --git a/Externals/SlippiRustExtensions/ffi/src/logger.rs b/Externals/SlippiRustExtensions/ffi/src/logger.rs index f74d42d47f..9cadd54563 100644 --- a/Externals/SlippiRustExtensions/ffi/src/logger.rs +++ b/Externals/SlippiRustExtensions/ffi/src/logger.rs @@ -43,4 +43,4 @@ pub extern "C" fn slprs_logging_update_container(kind: *const c_char, enabled: b #[no_mangle] pub extern "C" fn slprs_mainline_logging_update_log_level(level: c_int) { dolphin_integrations::ffi::logger::mainline_update_log_level(level); -} \ No newline at end of file +} diff --git a/Externals/SlippiRustExtensions/game-reporter/src/queue.rs b/Externals/SlippiRustExtensions/game-reporter/src/queue.rs index 028c161674..ddab403aca 100644 --- a/Externals/SlippiRustExtensions/game-reporter/src/queue.rs +++ b/Externals/SlippiRustExtensions/game-reporter/src/queue.rs @@ -47,12 +47,10 @@ pub struct GameReporterQueue { impl GameReporterQueue { /// Initializes and returns a new game reporter. pub(crate) fn new() -> Self { - // `max_idle_connections` is set to `0` to mimic how the CURL setup in the - // C++ version was done - i.e, I don't want to introduce connection pooling - // without Fizzi/Nikki opting in to it. + // We set `max_idle_connections` to `5` to mimic how CURL was configured in + // the old C++ version of this module. let http_client = ureq::AgentBuilder::new() - //.https_only(true) - .max_idle_connections(0) + .max_idle_connections(5) .user_agent("SlippiGameReporter/Rust v0.1") .build(); @@ -103,10 +101,10 @@ impl GameReporterQueue { match res { Ok(value) if value == "true" => { - tracing::info!(target: Log::GameReporter, "Successfully executed abandonment request") + tracing::info!(target: Log::GameReporter, "Successfully executed completion request") }, - Ok(value) => tracing::error!(target: Log::GameReporter, ?value, "Error executing abandonment request",), - Err(error) => tracing::error!(target: Log::GameReporter, ?error, "Error executing abandonment request"), + Ok(value) => tracing::error!(target: Log::GameReporter, ?value, "Error executing completion request",), + Err(error) => tracing::error!(target: Log::GameReporter, ?error, "Error executing completion request"), } }