From 2fdbf6df60a61741fc5bd3d272c102e683afc25f Mon Sep 17 00:00:00 2001 From: Kasama Date: Sun, 22 Jun 2025 11:50:06 -0300 Subject: [PATCH 1/6] fix: comment logs that are spamming for bitcraft --- crates/core/src/host/wasm_common/module_host_actor.rs | 2 +- crates/core/src/subscription/module_subscription_manager.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/crates/core/src/host/wasm_common/module_host_actor.rs b/crates/core/src/host/wasm_common/module_host_actor.rs index ca4a70ef34e..3ca3395813d 100644 --- a/crates/core/src/host/wasm_common/module_host_actor.rs +++ b/crates/core/src/host/wasm_common/module_host_actor.rs @@ -460,7 +460,7 @@ impl WasmModuleInstance { } } Ok(Err(errmsg)) => { - log::info!("reducer returned error: {errmsg}"); + // log::info!("reducer returned error: {errmsg}"); self.replica_context().logger.write( database_logger::LogLevel::Error, diff --git a/crates/core/src/subscription/module_subscription_manager.rs b/crates/core/src/subscription/module_subscription_manager.rs index eb230881083..1874b2f33ee 100644 --- a/crates/core/src/subscription/module_subscription_manager.rs +++ b/crates/core/src/subscription/module_subscription_manager.rs @@ -1521,7 +1521,7 @@ impl SendWorker { fn send_to_client(client: &ClientConnectionSender, message: impl Into) { if let Err(e) = client.send_message(message) { - tracing::warn!(%client.id, "failed to send update message to client: {e}") + // tracing::warn!(%client.id, "failed to send update message to client: {e}") } } From 70c2fe6a88dd5c18f8754d63c26ddfef863a1af7 Mon Sep 17 00:00:00 2001 From: Kasama Date: Sun, 22 Jun 2025 11:53:48 -0300 Subject: [PATCH 2/6] fix: remove additional database logger --- .../src/host/wasm_common/module_host_actor.rs | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/crates/core/src/host/wasm_common/module_host_actor.rs b/crates/core/src/host/wasm_common/module_host_actor.rs index 3ca3395813d..6572f691cf8 100644 --- a/crates/core/src/host/wasm_common/module_host_actor.rs +++ b/crates/core/src/host/wasm_common/module_host_actor.rs @@ -462,17 +462,17 @@ impl WasmModuleInstance { Ok(Err(errmsg)) => { // log::info!("reducer returned error: {errmsg}"); - self.replica_context().logger.write( - database_logger::LogLevel::Error, - &database_logger::Record { - ts: chrono::DateTime::from_timestamp_micros(timestamp.to_micros_since_unix_epoch()).unwrap(), - target: Some(reducer_name), - filename: None, - line_number: None, - message: &errmsg, - }, - &(), - ); + // self.replica_context().logger.write( + // database_logger::LogLevel::Error, + // &database_logger::Record { + // ts: chrono::DateTime::from_timestamp_micros(timestamp.to_micros_since_unix_epoch()).unwrap(), + // target: Some(reducer_name), + // filename: None, + // line_number: None, + // message: &errmsg, + // }, + // &(), + // ); EventStatus::Failed(errmsg.into()) } // We haven't actually committed yet - `commit_and_broadcast_event` will commit From 66d79b8ed3f369b864aa69dcd6e7d7e3e6e4ef03 Mon Sep 17 00:00:00 2001 From: Kasama Date: Sun, 22 Jun 2025 12:01:30 -0300 Subject: [PATCH 3/6] fix: unused variable after log commenting --- crates/core/src/subscription/module_subscription_manager.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/core/src/subscription/module_subscription_manager.rs b/crates/core/src/subscription/module_subscription_manager.rs index 1874b2f33ee..2b81c30ba00 100644 --- a/crates/core/src/subscription/module_subscription_manager.rs +++ b/crates/core/src/subscription/module_subscription_manager.rs @@ -1520,9 +1520,9 @@ impl SendWorker { } fn send_to_client(client: &ClientConnectionSender, message: impl Into) { - if let Err(e) = client.send_message(message) { - // tracing::warn!(%client.id, "failed to send update message to client: {e}") - } + // if let Err(e) = client.send_message(message) { + // tracing::warn!(%client.id, "failed to send update message to client: {e}") + // } } #[cfg(test)] From cd2e596ea1a1ae75588dda45828c36846f01ad5d Mon Sep 17 00:00:00 2001 From: Kasama Date: Sun, 22 Jun 2025 12:06:23 -0300 Subject: [PATCH 4/6] fix: keep sending client message, but disregard the error logging --- crates/core/src/subscription/module_subscription_manager.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/core/src/subscription/module_subscription_manager.rs b/crates/core/src/subscription/module_subscription_manager.rs index 2b81c30ba00..914f081c324 100644 --- a/crates/core/src/subscription/module_subscription_manager.rs +++ b/crates/core/src/subscription/module_subscription_manager.rs @@ -1520,9 +1520,9 @@ impl SendWorker { } fn send_to_client(client: &ClientConnectionSender, message: impl Into) { - // if let Err(e) = client.send_message(message) { - // tracing::warn!(%client.id, "failed to send update message to client: {e}") - // } + if let Err(_e) = client.send_message(message) { + // tracing::warn!(%client.id, "failed to send update message to client: {e}") + } } #[cfg(test)] From c82831566c204f1bba4392bb506e6e2c9ab3e59c Mon Sep 17 00:00:00 2001 From: Kasama Date: Sun, 22 Jun 2025 12:16:09 -0300 Subject: [PATCH 5/6] comment out unused import --- crates/core/src/host/wasm_common/module_host_actor.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/crates/core/src/host/wasm_common/module_host_actor.rs b/crates/core/src/host/wasm_common/module_host_actor.rs index 6572f691cf8..185f65703cd 100644 --- a/crates/core/src/host/wasm_common/module_host_actor.rs +++ b/crates/core/src/host/wasm_common/module_host_actor.rs @@ -7,7 +7,8 @@ use std::sync::Arc; use std::time::Duration; use super::instrumentation::CallTimes; -use crate::database_logger::{self, SystemLogger}; +// use crate::database_logger; +use crate::database_logger::SystemLogger; use crate::db::datastore::locking_tx_datastore::MutTxId; use crate::db::datastore::traits::{IsolationLevel, Program}; use crate::db::db_metrics::DB_METRICS; From 162c69ca103f5ce434e660195898c1896e7a43d3 Mon Sep 17 00:00:00 2001 From: Kasama Date: Sun, 22 Jun 2025 12:42:03 -0300 Subject: [PATCH 6/6] fix: comment out test check for removed spacetimedb logs --- smoketests/tests/client_connected_error_rejects_connection.py | 2 +- smoketests/tests/panic.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/smoketests/tests/client_connected_error_rejects_connection.py b/smoketests/tests/client_connected_error_rejects_connection.py index 8654643ad19..093cf884552 100644 --- a/smoketests/tests/client_connected_error_rejects_connection.py +++ b/smoketests/tests/client_connected_error_rejects_connection.py @@ -36,7 +36,7 @@ def test_client_connected_error_rejects_connection(self): self.subscribe("select * from all_u8s", n = 0)() logs = self.logs(100) - self.assertIn('Rejecting connection from client', logs) + # self.assertIn('Rejecting connection from client', logs) self.assertNotIn('This should never be called, since we reject all connections!', logs) class ClientDisconnectedErrorStillDeletesStClient(Smoketest): diff --git a/smoketests/tests/panic.py b/smoketests/tests/panic.py index 0fd917340b3..6902f0d36b4 100644 --- a/smoketests/tests/panic.py +++ b/smoketests/tests/panic.py @@ -47,4 +47,4 @@ def test_reducer_error_message(self): with self.assertRaises(Exception): self.call("fail") - self.assertIn("oopsie :(", self.logs(2)) + # self.assertIn("oopsie :(", self.logs(2))