Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions crates/core/src/host/wasm_common/module_host_actor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -460,19 +461,19 @@ impl<T: WasmInstance> WasmModuleInstance<T> {
}
}
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,
},
&(),
);
// 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,
// },
// &(),
// );
EventStatus::Failed(errmsg.into())
}
// We haven't actually committed yet - `commit_and_broadcast_event` will commit
Expand Down
4 changes: 2 additions & 2 deletions crates/core/src/subscription/module_subscription_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1520,8 +1520,8 @@ impl SendWorker {
}

fn send_to_client(client: &ClientConnectionSender, message: impl Into<SerializableMessage>) {
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}")
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion smoketests/tests/panic.py
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Loading