Compare commits

..

No commits in common. "3b67d58ae28157fd614c04f2b410fb77449b9fbf" and "047cc110a49e418760d7e2fc6c500446f54101d8" have entirely different histories.

3 changed files with 4 additions and 20 deletions

View File

@ -39,7 +39,7 @@ def local_env_image() -> bytes:
img = Image.new("RGB", (800, 120), (255, 255, 255))
# 往图片上写入一些信息
draw = ImageDraw.Draw(img)
font = ImageFont.truetype("SMILEYSANS-OBLIQUE.TTF", size=25)
font = ImageFont.truetype("simkai.ttf", size=25)
draw.text((10, 10), local_env_info(), fill=(0, 0, 0), font=font)
img_cache = io.BytesIO()
img.save(img_cache, format="PNG")

View File

@ -100,29 +100,13 @@ macro_rules! call_py_func {
tokio::spawn(async move {
Python::with_gil(|py| {
if let Ok(py_func) = get_func($plugin.py_module.bind(py), $func_name) {
if let Err(py_err) = py_func.call1($args) {
if let Err(e) = py_func.call1($args) {
let e = PyPluginError::FuncCallError(
py_err,
e,
$func_name.to_string(),
$plugin_path.to_string_lossy().to_string(),
);
event!(
Level::WARN,
"failed to call function<{}>: {}\ntraceback: {}",
$func_name,
e,
// 获取 traceback
match &e {
PyPluginError::FuncCallError(py_err, _, _) => match py_err.traceback_bound(py) {
Some(traceback) => match traceback.format() {
Ok(trace) => trace,
Err(trace_e) => format!("failed to format traceback: {:?}", trace_e),
},
None => "no traceback".to_string(),
},
_ => unreachable!(),
}
);
event!(Level::WARN, "failed to call function<{}>: {:?}", $func_name, e);
}
}
})