neurocyte/flow
neurocyte/flow
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(log): never attempt to log a raw cbor message

Browse source 
closes #144
This commit is contained in:
CJ van den Berg 2025-01-28 22:21:30 +01:00
parent 7481be5aaf
commit 80e8f0ebda
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/log.zig
View file

@ -127,6 +127,8 @@ pub const Logger = struct {
} }
pub fn err(self: Logger, context: []const u8, e: anyerror) void { pub fn err(self: Logger, context: []const u8, e: anyerror) void {
var msg_fmt = std.ArrayList(u8).init(std.heap.c_allocator);
defer msg_fmt.deinit();
defer tp.reset_error(); defer tp.reset_error();
var buf: [max_log_message]u8 = undefined; var buf: [max_log_message]u8 = undefined;
var msg: []const u8 = "UNKNOWN"; var msg: []const u8 = "UNKNOWN";
@ -140,7 +142,16 @@ pub const Logger = struct {
} else if (msg_.match(.{ "exit", tp.extract(&msg__), tp.extract(&trace__) }) catch false) { } else if (msg_.match(.{ "exit", tp.extract(&msg__), tp.extract(&trace__) }) catch false) {
// //
} else { } else {
msg__ = msg_.buf; var failed = false;
msg_fmt.writer().print("{}", .{msg_}) catch {
failed = true;
};
if (failed) {
msg_fmt.clearRetainingCapacity();
msg_fmt.writer().print("{s}", .{std.fmt.fmtSliceEscapeLower(msg_.buf)}) catch {};
}
msg__ = msg_fmt.items;
tp.trace(tp.channel.debug, .{ "log_err_fmt", msg__.len, msg__[0..@min(msg__.len, 128)] });
} }
if (msg__.len > buf.len) { if (msg__.len > buf.len) {
self.proc.send(.{ "log", "error", self.tag, context, "->", "MESSAGE TOO LARGE" }) catch {}; self.proc.send(.{ "log", "error", self.tag, context, "->", "MESSAGE TOO LARGE" }) catch {};