This commit is contained in:
Edgar 2023-10-03 12:22:50 +02:00
parent f41fd89d8c
commit 3f7d9a202f
No known key found for this signature in database
GPG key ID: 70ADAE8F35904387
2 changed files with 12 additions and 12 deletions

View file

@ -5,7 +5,7 @@ use std::{
time::Duration, time::Duration,
}; };
use axum::{routing::get, Router, response::Html}; use axum::{response::Html, routing::get, Router};
use http::Method; use http::Method;
use reqwest::Client; use reqwest::Client;
use sqlx::{postgres::PgPoolOptions, PgPool}; use sqlx::{postgres::PgPoolOptions, PgPool};
@ -21,7 +21,7 @@ use tokio::{
use tower_http::{ use tower_http::{
cors::{self, CorsLayer}, cors::{self, CorsLayer},
timeout::TimeoutLayer, timeout::TimeoutLayer,
trace::{TraceLayer, DefaultMakeSpan}, trace::{DefaultMakeSpan, TraceLayer},
}; };
use tracing::{error, info}; use tracing::{error, info};
@ -124,10 +124,10 @@ async fn run() -> anyhow::Result<()> {
address address
);*/ );*/
events.push(( events.push((
MasterEvent::ClientJoined( MasterEvent::ClientJoined {
(*player).clone(), client: (*player).clone(),
server.clone(), server: server.clone(),
), },
now, now,
)); ));
} else { } else {
@ -140,10 +140,10 @@ async fn run() -> anyhow::Result<()> {
); );
*/ */
events.push(( events.push((
MasterEvent::ClientLeft( MasterEvent::ClientLeft {
(*player).clone(), client: (*player).clone(),
server.clone(), server: server.clone(),
), },
now, now,
)); ));
} }

View file

@ -77,8 +77,8 @@ pub struct ServerListMap {
#[derive(Debug, Serialize, Clone)] #[derive(Debug, Serialize, Clone)]
pub enum MasterEvent { pub enum MasterEvent {
ClientJoined(Client, Arc<Server>), ClientJoined { client: Client, server: Arc<Server> },
ClientLeft(Client, Arc<Server>), ClientLeft { client: Client, server: Arc<Server> },
ServerWentOnline(Arc<Server>), ServerWentOnline(Arc<Server>),
ServerWentOffline(Arc<Server>), ServerWentOffline(Arc<Server>),
} }