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

feat: lua logger improvements

Browse source 
distinct fn for setup and get, setup is idempotent
This commit is contained in:
əlemi 2024-08-06 23:02:28 +02:00
parent cd9a2d6247
commit 2cc23f2ec2
Signed by: alemi
GPG key ID: A4895B84D311642C
1 changed files with 35 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
src/ffi/lua.rs
View file

@ -1,14 +1,18 @@
use std::io::Write;
use std::sync::{mpsc, Arc, Mutex};
use std::sync::atomic::AtomicBool;
use std::sync::Mutex;
use crate::api::Cursor;
use crate::prelude::*;
use mlua::prelude::*;
use tokio::runtime::Runtime;
use tokio::sync::broadcast;
lazy_static::lazy_static!{
// TODO use a runtime::Builder::new_current_thread() runtime to not behave like malware
static ref STATE : GlobalState = GlobalState::default();
static ref LOG : broadcast::Sender<String> = broadcast::channel(32).0;
static ref ONCE : AtomicBool = AtomicBool::new(false);
}
struct GlobalState {
@ -199,36 +203,29 @@ impl LuaUserData for CodempTextChange {
// setup library logging to file
#[derive(Debug, derive_more::From)]
struct LuaLogger(Arc<Mutex<mpsc::Receiver<String>>>);
struct LuaLogger(broadcast::Receiver<String>);
impl LuaUserData for LuaLogger {
fn add_methods<'lua, M: LuaUserDataMethods<'lua, Self>>(methods: &mut M) {
methods.add_method("recv", |_, this, ()| {
Ok(
this.0
.lock()
.expect("logger mutex poisoned")
.recv()
.expect("logger channel closed")
)
methods.add_method_mut("recv", |_, this, ()| {
Ok(this.0.blocking_recv().expect("logger channel closed"))
});
}
}
#[derive(Debug, Clone)]
struct LuaLoggerProducer(mpsc::Sender<String>);
struct LuaLoggerProducer;
impl Write for LuaLoggerProducer {
fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
self.0.send(String::from_utf8_lossy(buf).to_string())
.expect("could not write on logger channel");
let _ = LOG.send(String::from_utf8_lossy(buf).to_string());
Ok(buf.len())
}
fn flush(&mut self) -> std::io::Result<()> { Ok(()) }
}
fn setup_tracing(_: &Lua, (debug,): (Option<bool>,)) -> LuaResult<LuaLogger> {
let (tx, rx) = mpsc::channel();
let level = if debug.unwrap_or(false) { tracing::Level::DEBUG } else {tracing::Level::INFO };
fn setup_logger(_: &Lua, (debug, path): (Option<bool>, Option<String>)) -> LuaResult<()> {
if ONCE.load(std::sync::atomic::Ordering::Relaxed) { return Ok(()) }
let format = tracing_subscriber::fmt::format()
.with_level(true)
.with_target(true)
@ -239,12 +236,27 @@ fn setup_tracing(_: &Lua, (debug,): (Option<bool>,)) -> LuaResult<LuaLogger> {
.with_line_number(false)
.with_source_location(false)
.compact();
tracing_subscriber::fmt()
let level = if debug.unwrap_or_default() { tracing::Level::DEBUG } else {tracing::Level::INFO };
let builder = tracing_subscriber::fmt()
.event_format(format)
.with_max_level(level)
.with_writer(Mutex::new(LuaLoggerProducer(tx)))
.init();
Ok(LuaLogger(Arc::new(Mutex::new(rx))))
.with_max_level(level);
if let Some(path) = path {
let logfile = std::fs::File::create(path).expect("failed creating logfile");
builder.with_writer(Mutex::new(logfile)).init();
} else {
builder.with_writer(Mutex::new(LuaLoggerProducer)).init();
}
ONCE.store(true, std::sync::atomic::Ordering::Relaxed);
Ok(())
}
fn get_logger(_: &Lua, (): ()) -> LuaResult<LuaLogger> {
let sub = LOG.subscribe();
Ok(LuaLogger(sub))
}
// define module and exports
@ -259,9 +271,9 @@ fn codemp_lua(lua: &Lua) -> LuaResult<LuaTable> {
exports.set("get_workspace", lua.create_function(get_workspace)?)?;
// debug
exports.set("id", lua.create_function(id)?)?;
exports.set("setup_tracing", lua.create_function(setup_tracing)?)?;
exports.set("get_logger", lua.create_function(get_logger)?)?;
exports.set("setup_logger", lua.create_function(setup_logger)?)?;
Ok(exports)
}