From 031ba8a21d3899d4e24bd1423ec738ebf95ab947 Mon Sep 17 00:00:00 2001
From: Dennis Kobert <d-kobert@web.de>
Date: Fri, 31 May 2019 06:49:25 +0200
Subject: Improve Exception Handling

Add WebhoggGroup
---
 game_server/src/server.rs | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

(limited to 'game_server/src/server.rs')

diff --git a/game_server/src/server.rs b/game_server/src/server.rs
index 0b76f15..5b1a7a9 100644
--- a/game_server/src/server.rs
+++ b/game_server/src/server.rs
@@ -8,8 +8,8 @@ use websocket::{OwnedMessage,
 use std::net::{SocketAddr, ToSocketAddrs, TcpStream};
 use std::sync::{mpsc,
                 mpsc::{Sender, Receiver}};
-use super::lobby::Lobby;
-use super::backend_connection::BackendConnection;
+use crate::lobby::Lobby;
+use crate::backend_connection::BackendConnection;
 
 pub type ClientReceiver = receiver::Reader<<TcpStream as Splittable>::Reader>;
 pub type ClientSender = sender::Writer<<TcpStream as Splittable>::Writer>;
@@ -24,7 +24,22 @@ pub enum GameServerError {
     BindError(std::io::Error),
     HandshakeRequestError,
     InvalidProtocolError,
-    AcceptError(std::io::Error)
+    AcceptError(std::io::Error),
+    GroupError(String),
+    GroupCreationError(String),
+}
+
+impl std::fmt::Display for GameServerError {
+    fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
+        match self {
+            GameServerError::BindError(e) => write!(f, "BindError: {}", e),
+            GameServerError::HandshakeRequestError => write!(f, "HandshakeRequestError"),
+            GameServerError::InvalidProtocolError => write!(f, "InvalidProtocolError"),
+            GameServerError::AcceptError(e) => write!(f, "AcceptError: {}", e),
+            GameServerError::GroupError(e) => write!(f, "GroupError: {}", e),
+            GameServerError::GroupCreationError(e) => write!(f, "GroupCreationError: {}", e),
+        }
+    }
 }
 
 pub struct GameServer {
@@ -111,7 +126,8 @@ impl GameServer {
                         user_id, token, client.host_name(), group_name);
                     //clients.lock().unwrap().insert(token, client);
                     self.lobby.add_client(&group_type, group_id,
-                                     &group_name, user_id, client);
+                                     &group_name, user_id, client)
+                              .unwrap_or_else(|e| warn!("failed to add client: {}", e));
                 }
             }
         } else {
-- 
cgit v1.2.3-54-g00ecf