hexedtech/codemp
3
0
Fork 0
mirror of https://github.com/hexedtech/codemp.git synced 2024-11-22 23:34:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix: lua use try_init for logging

Browse source
This commit is contained in:
əlemi 2024-08-06 23:56:28 +02:00
parent 13f862a0e8
commit 72e86a8079
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/ffi/lua.rs
View file

@ -12,7 +12,6 @@ lazy_static::lazy_static!{
// TODO use a runtime::Builder::new_current_thread() runtime to not behave like malware // TODO use a runtime::Builder::new_current_thread() runtime to not behave like malware
static ref STATE : GlobalState = GlobalState::default(); static ref STATE : GlobalState = GlobalState::default();
static ref LOG : broadcast::Sender<String> = broadcast::channel(32).0; static ref LOG : broadcast::Sender<String> = broadcast::channel(32).0;
static ref ONCE : AtomicBool = AtomicBool::new(false);
} }
struct GlobalState { struct GlobalState {
@ -223,9 +222,7 @@ impl Write for LuaLoggerProducer {
fn flush(&mut self) -> std::io::Result<()> { Ok(()) } fn flush(&mut self) -> std::io::Result<()> { Ok(()) }
} }
fn setup_logger(_: &Lua, (debug, path): (Option<bool>, Option<String>)) -> LuaResult<()> { fn setup_logger(_: &Lua, (debug, path): (Option<bool>, Option<String>)) -> LuaResult<bool> {
if ONCE.load(std::sync::atomic::Ordering::Relaxed) { return Ok(()) }
let format = tracing_subscriber::fmt::format() let format = tracing_subscriber::fmt::format()
.with_level(true) .with_level(true)
.with_target(true) .with_target(true)
@ -243,15 +240,14 @@ fn setup_logger(_: &Lua, (debug, path): (Option<bool>, Option<String>)) -> LuaRe
.event_format(format) .event_format(format)
.with_max_level(level); .with_max_level(level);
if let Some(path) = path { let result = if let Some(path) = path {
let logfile = std::fs::File::create(path).expect("failed creating logfile"); let logfile = std::fs::File::create(path).expect("failed creating logfile");
builder.with_writer(Mutex::new(logfile)).init(); builder.with_writer(Mutex::new(logfile)).try_init().is_ok()
} else { } else {
builder.with_writer(Mutex::new(LuaLoggerProducer)).init(); builder.with_writer(Mutex::new(LuaLoggerProducer)).try_init().is_ok()
} };
ONCE.store(true, std::sync::atomic::Ordering::Relaxed); Ok(result)
Ok(())
} }
fn get_logger(_: &Lua, (): ()) -> LuaResult<LuaLogger> { fn get_logger(_: &Lua, (): ()) -> LuaResult<LuaLogger> {