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

fix: dont use color codes in logger

Browse source
This commit is contained in:
əlemi 2024-09-17 22:17:34 +02:00
parent f5f0a7edf1
commit 864348bef4
Signed by: alemi
GPG key ID: A4895B84D311642C
2 changed files with 12 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.github/workflows/lua.yml vendored
View file

@ -4,6 +4,7 @@ on:
push: push:
branches: branches:
- stable - stable
- dev
permissions: permissions:
contents: read contents: read

38
src/ffi/lua.rs
View file

@ -451,6 +451,15 @@ impl Write for LuaLoggerProducer {
// TODO can we make this less verbose? // TODO can we make this less verbose?
fn logger(_: &Lua, (printer, debug): (LuaValue, Option<bool>)) -> LuaResult<bool> { fn logger(_: &Lua, (printer, debug): (LuaValue, Option<bool>)) -> LuaResult<bool> {
let level = if debug.unwrap_or_default() { tracing::Level::DEBUG } else {tracing::Level::INFO }; let level = if debug.unwrap_or_default() { tracing::Level::DEBUG } else {tracing::Level::INFO };
let format = tracing_subscriber::fmt::format()
.with_level(true)
.with_target(true)
.with_thread_ids(false)
.with_thread_names(false)
.with_file(false)
.with_line_number(false)
.with_source_location(false);
let success = match printer { let success = match printer {
LuaValue::Boolean(_) LuaValue::Boolean(_)
| LuaValue::LightUserData(_) | LuaValue::LightUserData(_)
@ -461,15 +470,6 @@ fn logger(_: &Lua, (printer, debug): (LuaValue, Option<bool>)) -> LuaResult<bool
| LuaValue::UserData(_) | LuaValue::UserData(_)
| LuaValue::Error(_) => return Err(LuaError::BindError), // TODO full BadArgument type?? | LuaValue::Error(_) => return Err(LuaError::BindError), // TODO full BadArgument type??
LuaValue::Nil => { LuaValue::Nil => {
let format = tracing_subscriber::fmt::format()
.with_level(true)
.with_target(true)
.with_thread_ids(true)
.with_thread_names(true)
.with_ansi(true)
.with_file(false)
.with_line_number(false)
.with_source_location(false);
tracing_subscriber::fmt() tracing_subscriber::fmt()
.event_format(format) .event_format(format)
.with_max_level(level) .with_max_level(level)
@ -479,37 +479,21 @@ fn logger(_: &Lua, (printer, debug): (LuaValue, Option<bool>)) -> LuaResult<bool
}, },
LuaValue::String(path) => { LuaValue::String(path) => {
let logfile = std::fs::File::create(path.to_string_lossy()).map_err(|e| LuaError::RuntimeError(e.to_string()))?; let logfile = std::fs::File::create(path.to_string_lossy()).map_err(|e| LuaError::RuntimeError(e.to_string()))?;
let format = tracing_subscriber::fmt::format()
.with_level(true)
.with_target(true)
.with_thread_ids(true)
.with_thread_names(true)
.with_ansi(false)
.with_file(false)
.with_line_number(false)
.with_source_location(false);
tracing_subscriber::fmt() tracing_subscriber::fmt()
.event_format(format) .event_format(format)
.with_max_level(level) .with_max_level(level)
.with_writer(Mutex::new(logfile)) .with_writer(Mutex::new(logfile))
.with_ansi(false)
.try_init() .try_init()
.is_ok() .is_ok()
}, },
LuaValue::Function(cb) => { LuaValue::Function(cb) => {
let (tx, mut rx) = mpsc::unbounded_channel(); let (tx, mut rx) = mpsc::unbounded_channel();
let format = tracing_subscriber::fmt::format()
.with_level(true)
.with_target(true)
.with_thread_ids(false)
.with_thread_names(false)
.with_ansi(false)
.with_file(false)
.with_line_number(false)
.with_source_location(false);
let res = tracing_subscriber::fmt() let res = tracing_subscriber::fmt()
.event_format(format) .event_format(format)
.with_max_level(level) .with_max_level(level)
.with_writer(Mutex::new(LuaLoggerProducer(tx))) .with_writer(Mutex::new(LuaLoggerProducer(tx)))
.with_ansi(false)
.try_init() .try_init()
.is_ok(); .is_ok();
if res { if res {