lyssieth/zig-lys
2
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix the whole logging mess :3

Browse source
This commit is contained in:
Lys 2024-12-06 08:39:02 +02:00
parent 580b12b111
commit 13cec10439
Signed by: lyssieth
GPG key ID: 6EE87E973D3AA8F2
1 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/log/logging.zig
View file

@ -130,8 +130,6 @@ pub fn deinit() void {
} }
} }
var longestScopeYet: usize = 0;
/// If using this log function, you *must* call `init` before any logging occurs. /// If using this log function, you *must* call `init` before any logging occurs.
/// Otherwise, it will complain. A lot. /// Otherwise, it will complain. A lot.
pub fn logFn(comptime level: Level, comptime scope: Scope, comptime format: []const u8, args: anytype) void { pub fn logFn(comptime level: Level, comptime scope: Scope, comptime format: []const u8, args: anytype) void {
@ -159,30 +157,26 @@ fn logFnImpl(comptime level: Level, comptime scope: Scope, comptime format: []co
arena.deinit(); arena.deinit();
} }
var scopeLen: usize = 4;
const scopeText = scopeTextBlk: { const scopeText = scopeTextBlk: {
switch (scope) { switch (scope) {
.default => break :scopeTextBlk "main", .default => break :scopeTextBlk "main",
.gpa => { .gpa => {
const gpa = "General Purpose Allocator"; const gpa = "GPAlloc";
scopeLen = gpa.len;
break :scopeTextBlk try c.redBright().fmt("{s}", .{gpa}); break :scopeTextBlk try c.redBright().fmt("{s}", .{gpa});
}, },
else => { else => {
for (globals.additionalScopes.items) |modifier| { for (globals.additionalScopes.items) |modifier| {
if (std.mem.eql(u8, modifier.scope, @tagName(scope))) { if (std.mem.eql(u8, modifier.scope.data, @tagName(scope))) {
const text = blk: { const text = blk: {
if (modifier.rename) |rename| { if (modifier.rename) |rename| {
break :blk rename; break :blk rename.data;
} else { } else {
break :blk @tagName(scope); break :blk @tagName(scope);
} }
}; };
scopeLen = text.len;
if (modifier.color) |color| { if (modifier.color) |color| {
switch (color) { switch (color) {
.default => break :scopeTextBlk text, .default => break :scopeTextBlk text,
@ -207,9 +201,6 @@ fn logFnImpl(comptime level: Level, comptime scope: Scope, comptime format: []co
unreachable; unreachable;
}; };
if (scopeLen > longestScopeYet)
longestScopeYet = scopeLen;
const levelText = switch (level) { const levelText = switch (level) {
.debug => try c.gray().fmt("{s: >5}", .{"DEBUG"}), .debug => try c.gray().fmt("{s: >5}", .{"DEBUG"}),
.info => try c.white().fmt("{s: >5}", .{"INFO"}), .info => try c.white().fmt("{s: >5}", .{"INFO"}),
@ -217,14 +208,8 @@ fn logFnImpl(comptime level: Level, comptime scope: Scope, comptime format: []co
.err => try c.red().fmt("{s: >5}", .{"ERROR"}), .err => try c.red().fmt("{s: >5}", .{"ERROR"}),
}; };
const paddingLen = longestScopeYet - scopeLen; const prefix = try std.fmt.allocPrint(arena.allocator(), "[{s}] {s}:", .{
const padding = try arena.allocator().alloc(u8, paddingLen);
for (padding) |*p| p.* = ' ';
const prefix = try std.fmt.allocPrint(arena.allocator(), "[{s}] [{s}{s}]", .{
levelText, levelText,
padding,
scopeText, scopeText,
}); });
@ -246,10 +231,24 @@ fn logFnImpl(comptime level: Level, comptime scope: Scope, comptime format: []co
} }
} }
test "logFn does something" { const t = std.testing;
const t = std.testing;
test "logFn works" {
try init(t.allocator); try init(t.allocator);
defer deinit(); defer deinit();
try logFnImpl(.info, .default, "hello world", .{}); try config.addScope(.{
.scope = TrackedString.initConst("someScope"),
.rename = TrackedString.initConst("some rename"),
.color = .green,
});
try config.addScope(.{
.scope = TrackedString.initConst("other"),
.rename = TrackedString.initConst("other rename"),
.color = .blue,
});
try logFnImpl(.err, .default, "hello world", .{});
try logFnImpl(.info, .someScope, "hello world", .{});
try logFnImpl(.warn, .other, "hello world", .{});
} }