Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

adjust tracing and remove unused coding

Browse Source
This commit is contained in:
Marcel Märtens 2021-10-18 00:00:20 +02:00
parent 7148737252
commit 7ba45fa7e5
2 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server-cli/src/main.rs
View File

@ -170,22 +170,23 @@ fn main() -> io::Result<()> {
) )
.expect("Failed to create server instance!"); .expect("Failed to create server instance!");
let mut gameserver_addresses = vec![];
for protocol in protocols_and_addresses { for protocol in protocols_and_addresses {
match protocol { gameserver_addresses.push(match protocol {
Protocol::Tcp { address } => { Protocol::Tcp { address } => ("TCP", address),
info!(?address, "TCP socket is ready to accept connections.");
},
Protocol::Quic { Protocol::Quic {
address, address,
cert_file_path: _, cert_file_path: _,
key_file_path: _, key_file_path: _,
} => { } => ("QUIC", address),
info!(?address, "QUIC socket is ready to accept connections."); })
},
}
} }
info!(?metrics_port, "Server is ready to accept connections."); info!(
?metrics_port,
?gameserver_addresses,
"Server is ready to accept connections."
);
let mut shutdown_coordinator = ShutdownCoordinator::new(Arc::clone(&sigusr1_signal)); let mut shutdown_coordinator = ShutdownCoordinator::new(Arc::clone(&sigusr1_signal));

6
server/src/settings.rs
View File

@ -37,12 +37,6 @@ const BANLIST_FILENAME: &str = "banlist.ron";
const SERVER_DESCRIPTION_FILENAME: &str = "description.ron"; const SERVER_DESCRIPTION_FILENAME: &str = "description.ron";
const ADMINS_FILENAME: &str = "admins.ron"; const ADMINS_FILENAME: &str = "admins.ron";
#[derive(Clone, Debug, Serialize, Deserialize)]
pub struct X509FilePair {
pub cert: PathBuf,
pub key: PathBuf,
}
#[derive(Copy, Clone, Debug, Deserialize, Serialize)] #[derive(Copy, Clone, Debug, Deserialize, Serialize)]
pub enum ServerBattleMode { pub enum ServerBattleMode {
Global(BattleMode), Global(BattleMode),