summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornatrixaeria <janng@gmx.de>2019-05-19 18:44:04 +0200
committernatrixaeria <janng@gmx.de>2019-05-19 18:44:04 +0200
commit2d815af3f6d062d55da2f2598ce5d506ee74cb6e (patch)
treefdcf583d93ce56afa032e95ccdbc30183b4b30b8
parent36df226f113151fe3c18831a082fea64ba8a0c03 (diff)
Refactor code
-rw-r--r--game_server/src/backend_connection.rs10
-rw-r--r--game_server/src/main.rs2
-rw-r--r--game_server/src/server.rs7
3 files changed, 4 insertions, 15 deletions
diff --git a/game_server/src/backend_connection.rs b/game_server/src/backend_connection.rs
index 4a12439..ed112d9 100644
--- a/game_server/src/backend_connection.rs
+++ b/game_server/src/backend_connection.rs
@@ -18,10 +18,6 @@ pub enum BackendError {
BadResponse(Response),
}
-struct TokenResponseStruct {
-
-}
-
pub type TokenValidity = Result<(), BackendError>;
pub type RequestData = Url;
pub type ResponseResult = Result<Response, ReqError>;
@@ -59,14 +55,10 @@ impl BackendConnection {
self.res_rec.recv().unwrap()
}
- pub fn host_name<'a>(&'a self) -> &'a str {
- &self.host
- }
-
pub fn validate_token(&self, token: &Token) -> TokenValidity {
let location = format!("/api/lobby/tokens/{}", token);
self.request(&location).map_err(|err| BackendError::UrlError(err))?;
- let mut response = self.get_response().map_err(|err| BackendError::RequestError(err))?;
+ let response = self.get_response().map_err(|err| BackendError::RequestError(err))?;
if response.status().is_success() {
Ok(())
} else if response.status() == reqwest::StatusCode::NOT_FOUND {
diff --git a/game_server/src/main.rs b/game_server/src/main.rs
index 4d05efe..628062e 100644
--- a/game_server/src/main.rs
+++ b/game_server/src/main.rs
@@ -8,8 +8,6 @@ mod game_logger;
#[macro_use] extern crate log;
-use backend_connection::BackendConnection;
-
fn main() {
game_logger::init_logger();
diff --git a/game_server/src/server.rs b/game_server/src/server.rs
index 79cd322..7a9c5b0 100644
--- a/game_server/src/server.rs
+++ b/game_server/src/server.rs
@@ -1,7 +1,7 @@
use websocket::{OwnedMessage,
sync::Server,
client::sync::Client,
- server::{NoTlsAcceptor, InvalidConnection,
+ server::{NoTlsAcceptor,
sync::AcceptResult}};
use std::net::{SocketAddr, ToSocketAddrs, TcpStream};
use std::sync::{mpsc,
@@ -82,10 +82,9 @@ impl GameServer {
pub fn run(&self) -> Result<(), GameServerError> {
let reader = self.read_clients();
loop {
- let mut connection = reader.recv().unwrap()?;
+ let connection = reader.recv().unwrap()?;
self.add_client(connection);
}
- Ok(())
}
fn add_client(&self, mut client: GameClient) {
@@ -160,7 +159,7 @@ impl GameServer {
}
}
},
- Err(e) => {
+ Err(_) => {
warn!("invalid client request");
Err(GameServerError::HandshakeRequestError)
}