From ef6df1339f6d612ad466f90d5438749e6ebfb6d7 Mon Sep 17 00:00:00 2001
From: Felix Ableitner <me@nutomic.com>
Date: Thu, 12 Mar 2020 12:03:04 +0100
Subject: [PATCH] Proper error logging for websocket

---
 server/Cargo.lock              |  1 +
 server/Cargo.toml              |  1 +
 server/src/websocket/server.rs | 18 +++++++++++-------
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/server/Cargo.lock b/server/Cargo.lock
index a39dcd641..a58e0438b 100644
--- a/server/Cargo.lock
+++ b/server/Cargo.lock
@@ -1448,6 +1448,7 @@ dependencies = [
  "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lettre 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "lettre_email 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
diff --git a/server/Cargo.toml b/server/Cargo.toml
index e73143687..10c0dfc81 100644
--- a/server/Cargo.toml
+++ b/server/Cargo.toml
@@ -19,6 +19,7 @@ actix-web = "2.0.0"
 actix-files = "0.2.1"
 actix-web-actors = "2.0.0"
 actix-rt = "1.0.0"
+log = "0.4.0"
 env_logger = "0.7.1"
 rand = "0.7.3"
 strum = "0.17.1"
diff --git a/server/src/websocket/server.rs b/server/src/websocket/server.rs
index 1cbcb34fb..e200b1b99 100644
--- a/server/src/websocket/server.rs
+++ b/server/src/websocket/server.rs
@@ -6,6 +6,7 @@ use actix::prelude::*;
 use diesel::r2d2::{ConnectionManager, Pool, PooledConnection};
 use diesel::PgConnection;
 use failure::Error;
+use log::warn;
 use rand::{rngs::ThreadRng, Rng};
 use serde::{Deserialize, Serialize};
 use serde_json::Value;
@@ -448,13 +449,16 @@ impl Handler<StandardMessage> for ChatServer {
   type Result = MessageResult<StandardMessage>;
 
   fn handle(&mut self, msg: StandardMessage, _: &mut Context<Self>) -> Self::Result {
-    let msg_out = match parse_json_message(self, msg) {
-      Ok(m) => m,
-      Err(e) => e.to_string(),
-    };
-
-    println!("Message Sent: {}", msg_out);
-    MessageResult(msg_out)
+    match parse_json_message(self, msg) {
+      Ok(m) => {
+        println!("Message Sent: {}", m);
+        MessageResult(m)
+      }
+      Err(e) => {
+        warn!("Error during message handling {}", e);
+        MessageResult(e.to_string())
+      }
+    }
   }
 }