lily/mudserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement robust logging with flexi_logger and update CI to verify logs
Some checks failed
Smoke tests / Build and smoke test (pull_request) Successful in 1m30s
Details
Smoke tests / Build and smoke test (push) Has been cancelled
Details

Browse Source
This commit is contained in:
AI Agent
2026-03-19 18:04:32 -06:00
parent 678543dd9a
commit b81362d4d1
9 changed files with 157 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/admin.rs
View File

@@ -74,6 +74,7 @@ async fn admin_promote(target: &str, state: &SharedState) -> CommandResult {
if target.is_empty() {
return simple(&format!("{}\r\n", ansi::error_msg("Usage: admin promote <player>")));
}
log::info!("Admin action: promote player '{}'", target);
let st = state.lock().await;
if st.db.set_admin(target, true) {
// Also update in-memory if online
@@ -124,6 +125,7 @@ async fn admin_demote(target: &str, state: &SharedState) -> CommandResult {
if target.is_empty() {
return simple(&format!("{}\r\n", ansi::error_msg("Usage: admin demote <player>")));
}
log::info!("Admin action: demote player '{}'", target);
let st = state.lock().await;
if st.db.set_admin(target, false) {
simple(&format!(
@@ -142,6 +144,7 @@ async fn admin_kick(target: &str, player_id: usize, state: &SharedState) -> Comm
if target.is_empty() {
return simple(&format!("{}\r\n", ansi::error_msg("Usage: admin kick <player>")));
}
log::info!("Admin action: kick player '{}'", target);
let mut st = state.lock().await;
let low = target.to_lowercase();
@@ -237,6 +240,7 @@ async fn admin_teleport(room_id: &str, player_id: usize, state: &SharedState) ->
ansi::error_msg("Usage: admin teleport <room_id>")
));
}
log::info!("Admin action: teleport player ID {} to '{}'", player_id, room_id);
let mut st = state.lock().await;
if st.world.get_room(room_id).is_none() {
let rooms: Vec<&String> = st.world.rooms.keys().collect();
@@ -329,6 +333,7 @@ async fn admin_teleport(room_id: &str, player_id: usize, state: &SharedState) ->
}
async fn admin_registration(args: &str, state: &SharedState) -> CommandResult {
log::info!("Admin action: registration setting updated: '{}'", args);
let st = state.lock().await;
match args.to_lowercase().as_str() {
"on" | "true" | "open" => {
@@ -365,6 +370,7 @@ async fn admin_announce(msg: &str, player_id: usize, state: &SharedState) -> Com
ansi::error_msg("Usage: admin announce <message>")
));
}
log::info!("Admin action: announcement by player ID {}: '{}'", player_id, msg);
let st = state.lock().await;
let announcement = CryptoVec::from(
format!(
@@ -405,6 +411,7 @@ async fn admin_announce(msg: &str, player_id: usize, state: &SharedState) -> Com
}
async fn admin_heal(args: &str, player_id: usize, state: &SharedState) -> CommandResult {
log::info!("Admin action: heal player '{}' (empty means self)", args);
let mut st = state.lock().await;
if args.is_empty() {
@@ -564,6 +571,7 @@ async fn admin_info(target: &str, state: &SharedState) -> CommandResult {
}
async fn admin_setattitude(args: &str, state: &SharedState) -> CommandResult {
log::info!("Admin action: setattitude '{}'", args);
let parts: Vec<&str> = args.splitn(3, ' ').collect();
if parts.len() < 3 {
return simple(&format!(

6
src/combat.rs
View File

@@ -69,6 +69,8 @@ pub fn resolve_combat_tick(
));
if new_npc_hp <= 0 {
let player_name = state.players.get(&player_id).map(|c| c.player.name.clone()).unwrap_or_else(|| "Unknown".into());
log::info!(target: "{combat}", "Combat: Player '{}' (ID {}) killed NPC '{}' ({})", player_name, player_id, npc_template.name, npc_id);
if let Some(inst) = state.npc_instances.get_mut(&npc_id) {
inst.alive = false;
inst.hp = 0;
@@ -351,7 +353,9 @@ pub fn player_death_respawn(player_id: usize, state: &mut GameState) -> String {
.players
.get(&player_id)
.map(|c| c.player.name.clone())
.unwrap_or_default();
.unwrap_or_else(|| "Unknown".into());
log::info!(target: "{combat}", "Combat: Player '{}' (ID {}) died and respawned at {}", player_name, player_id, spawn_room);
if let Some(conn) = state.players.get_mut(&player_id) {
conn.player.stats.hp = conn.player.stats.max_hp;

2
src/commands.rs
View File

@@ -1222,6 +1222,8 @@ async fn cmd_attack(pid: usize, target: &str, state: &SharedState) -> CommandRes
});
}
log::info!(target: "{combat}", "Combat: Player '{}' (ID {}) engaged NPC '{}' ({}) in combat", pname, pid, npc_name, npc_id);
CommandResult {
output: format!(
"{}\r\n{}\r\n{}",

52
src/main.rs
View File

@@ -2,6 +2,8 @@ use std::path::PathBuf;
use std::sync::Arc;
use tokio::sync::Mutex;
use flexi_logger::writers::FileLogWriter;
use flexi_logger::{Cleanup, Criterion, Duplicate, FileSpec, Logger, Naming, WriteMode};
use russh::keys::ssh_key::rand_core::OsRng;
use russh::server::Server as _;
use tokio::net::TcpListener;
@@ -18,12 +20,12 @@ const DEFAULT_DB_PATH: &str = "./mudserver.db";
#[tokio::main]
async fn main() {
env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info")).init();
let mut port = DEFAULT_PORT;
let mut jsonrpc_port = 2223;
let mut world_dir = PathBuf::from(DEFAULT_WORLD_DIR);
let mut db_path = PathBuf::from(DEFAULT_DB_PATH);
let mut log_dir = "logs".to_string();
let mut log_level = "info".to_string();
let args: Vec<String> = std::env::args().collect();
let mut i = 1;
@@ -51,12 +53,22 @@ async fn main() {
i += 1;
db_path = PathBuf::from(args.get(i).expect("--db requires a path"));
}
"--log-dir" => {
i += 1;
log_dir = args.get(i).expect("--log-dir requires a path").to_string();
}
"--log-level" => {
i += 1;
log_level = args.get(i).expect("--log-level requires a level").to_string();
}
"--help" => {
eprintln!("Usage: mudserver [OPTIONS]");
eprintln!(" --port, -p SSH listen port (default: {DEFAULT_PORT})");
eprintln!(" --rpc-port JSON-RPC listen port (default: 2223)");
eprintln!(" --world, -w World directory (default: {DEFAULT_WORLD_DIR})");
eprintln!(" --db, -d Database path (default: {DEFAULT_DB_PATH})");
eprintln!(" --log-dir Directory for log files (default: logs)");
eprintln!(" --log-level Logging level (default: info)");
std::process::exit(0);
}
other => {
@@ -67,6 +79,42 @@ async fn main() {
i += 1;
}
// Ensure log directory exists
std::fs::create_dir_all(&log_dir).unwrap_or_else(|e| {
eprintln!("Failed to create log directory: {e}");
std::process::exit(1);
});
// Initialize logger
let combat_writer = FileLogWriter::builder(FileSpec::default().directory(&log_dir).basename("combat"))
.rotate(
Criterion::Size(10_000_000), // 10 MB
Naming::Numbers,
Cleanup::KeepLogFiles(7),
)
.append()
.write_mode(WriteMode::Direct)
.try_build()
.unwrap();
Logger::try_with_str(&log_level)
.unwrap()
.log_to_file(FileSpec::default().directory(&log_dir).basename("mudserver"))
.append()
.duplicate_to_stderr(Duplicate::All)
.rotate(
Criterion::Size(10_000_000), // 10 MB
Naming::Numbers,
Cleanup::KeepLogFiles(7),
)
.write_mode(WriteMode::Direct)
.add_writer("combat", Box::new(combat_writer))
.start()
.unwrap_or_else(|e| {
eprintln!("Failed to initialize logger: {e}");
std::process::exit(1);
});
log::info!("Loading world from: {}", world_dir.display());
let loaded_world = world::World::load(&world_dir).unwrap_or_else(|e| {
eprintln!("Failed to load world: {e}");

9
src/ssh.rs
View File

@@ -83,6 +83,8 @@ impl MudHandler {
state.load_existing_player(self.id, saved, Some(channel), Some(handle));
drop(state);
log::info!("Player '{}' (id={}) logged in", self.username, self.id);
let msg = format!(
"{}\r\n",
ansi::system_msg("Welcome back! Your character has been restored.")
@@ -171,6 +173,13 @@ impl MudHandler {
.map(|c| c.name.clone())
.unwrap_or_default();
log::info!(
"New character created: {} (Race: {}, Class: {})",
self.username,
race_name,
class_name
);
state.create_new_player(
self.id,
self.username.clone(),