[code] remove server struct
This commit is contained in:
parent
a2a630893f
commit
c00b7dbe9c
@ -27,8 +27,6 @@ mod assets;
|
||||
static KEY_PEM: &str = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/../../key.pem"));
|
||||
static CERT_PEM: &str = include_str!(concat!(env!("CARGO_MANIFEST_DIR"), "/../../cert.pem"));
|
||||
|
||||
struct Server;
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
struct ServerCtx {
|
||||
handler: RequestHandler,
|
||||
@ -40,7 +38,6 @@ struct ConnectionCtx {
|
||||
remote_addr: String,
|
||||
}
|
||||
|
||||
impl Server {
|
||||
async fn run(addr: SocketAddr, db: GameDB) -> eyre::Result<()> {
|
||||
let mut server = QuicServer::builder()
|
||||
.with_tls((CERT_PEM, KEY_PEM))?
|
||||
@ -78,13 +75,8 @@ impl Server {
|
||||
|
||||
let request = Request::decode(data);
|
||||
tracing::debug!("{} msg: {:?}", conn_ctx.remote_addr, request);
|
||||
let response =
|
||||
conn_ctx.server_ctx.handler.handle_request(request).await;
|
||||
tracing::trace!(
|
||||
"{} server response: {:?}",
|
||||
conn_ctx.remote_addr,
|
||||
response
|
||||
);
|
||||
let response = conn_ctx.server_ctx.handler.handle_request(request).await;
|
||||
tracing::trace!("{} server response: {:?}", conn_ctx.remote_addr, response);
|
||||
let raw_response = response.encode();
|
||||
tracing::trace!(
|
||||
"{} server response (raw): {}",
|
||||
@ -109,7 +101,6 @@ impl Server {
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Clone, Debug)]
|
||||
struct RequestHandler {
|
||||
@ -225,5 +216,5 @@ async fn main() -> eyre::Result<()> {
|
||||
|
||||
tracing::info!("Server listening on {}:{}", cli.ip, cli.port);
|
||||
|
||||
Server::run(SocketAddr::from((cli.ip, cli.port)), game_db).await
|
||||
run(SocketAddr::from((cli.ip, cli.port)), game_db).await
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user