From f32cd1b507e25d270f088b9f41d33bbfa2782c87 Mon Sep 17 00:00:00 2001 From: Thilo Behnke Date: Mon, 27 Jun 2022 23:15:43 +0200 Subject: [PATCH] investigating issue with failed heartbeat persists --- client/svelte-client/src/store/session.ts | 3 ++- server/src/websocket_handler.rs | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/client/svelte-client/src/store/session.ts b/client/svelte-client/src/store/session.ts index 177d7ab..0354d79 100644 --- a/client/svelte-client/src/store/session.ts +++ b/client/svelte-client/src/store/session.ts @@ -107,7 +107,8 @@ function createNetworkEvents() { return; } console.debug("producing message to ws: ", message); - ws.send(JSON.stringify(message)); + // TODO: Hotfix, double serialize to ease deserialization on server. + ws.send(JSON.stringify({msg_type: message.msg_type, payload: JSON.stringify(message.payload)})); } function produce(snapshot: SessionSnapshot) { diff --git a/server/src/websocket_handler.rs b/server/src/websocket_handler.rs index 3beb50d..981c254 100644 --- a/server/src/websocket_handler.rs +++ b/server/src/websocket_handler.rs @@ -430,7 +430,7 @@ fn write_events(events: Vec, topic: &str, event_writer: &mut SessionWriter for event in events { let serialized = serde_json::to_string(&event); if let Err(e) = serialized { - eprintln!("Failed to serialize event {:?} in topic {}: {:?}", event, topic, e); + error!("Failed to serialize event {:?} in topic {}: {:?}", event, topic, e); any_error = true; continue; } @@ -441,7 +441,7 @@ fn write_events(events: Vec, topic: &str, event_writer: &mut SessionWriter let to_send = to_send.iter().map(|e| e.as_str()).collect(); let write_res = event_writer.write_to_session(topic, to_send); if let Err(e) = write_res { - eprintln!("Failed to write at least one event to topic {}: {:?}", topic, e); + error!("Failed to write at least one event to topic {}: {:?}", topic, e); any_error = true; } return any_error;