summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorFelix Ableitner <me@nutomic.com>2020-03-12 12:03:04 +0100
committerFelix Ableitner <me@nutomic.com>2020-03-12 12:03:04 +0100
commitef6df1339f6d612ad466f90d5438749e6ebfb6d7 (patch)
tree6d26b6e2cd9b678960943e792ee394b8183c4c5e /server
parent4fbf55d79e355608c75aa8218cd7f487c58fa04d (diff)
Proper error logging for websocket
Diffstat (limited to 'server')
-rw-r--r--server/Cargo.lock1
-rw-r--r--server/Cargo.toml1
-rw-r--r--server/src/websocket/server.rs18
3 files changed, 13 insertions, 7 deletions
diff --git a/server/Cargo.lock b/server/Cargo.lock
index a39dcd64..a58e0438 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 e7314368..10c0dfc8 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 1cbcb34f..e200b1b9 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())
+ }
+ }
}
}