From 1c6526e88ba37cfd3d5f115ba29de291ef030360 Mon Sep 17 00:00:00 2001 From: robin Date: Sun, 16 Aug 2026 14:26:01 +0200 Subject: [PATCH] main: init fern in main --- src/main.zig | 9 +++++++-- src/root.zig | 6 ------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main.zig b/src/main.zig index f8ee772..0e704f4 100644 --- a/src/main.zig +++ b/src/main.zig @@ -29,10 +29,15 @@ pub fn main(init: process.Init) !void { const config: maivi.Config = try .init(init.io, init.arena, init.environ_map); + try fern.init(init.io, init.gpa, .{ + .level = config.log_level, + }); + defer fern.deinit(); + if (!maivi.dev) - maivi.rev = init.environ_map.get("MAIVI_REV") orelse rev_str(init.io, init.gpa, config.root) catch + maivi.rev = init.environ_map.get("MAIVI_REV") orelse rev_str(init.io, init.gpa, config.root) catch |e| blk: { - std.log.warn("version info cannot be retrieved from git. version must be provided using MAIVI_REV", .{}); + fern.warn().msg("version info cannot be retrieved from git. version must be provided using MAIVI_REV").err(e).log(); break :blk null; }; defer if (maivi.rev) |rev| init.gpa.free(rev); diff --git a/src/root.zig b/src/root.zig index 3c7c374..a4ac8c6 100644 --- a/src/root.zig +++ b/src/root.zig @@ -45,11 +45,6 @@ pub fn init(init_io: Io, init_allocator: Allocator, cfg: *const Config) !void { luaruntime = build or dev; config = cfg; - try fern.init(io, allocator, .{ - .level = config.log_level, - }); - errdefer fern.deinit(); - fern.debug().ctx("maivi.init") .str("root", config.root) .str("base_url", config.base_url) @@ -75,7 +70,6 @@ pub fn init(init_io: Io, init_allocator: Allocator, cfg: *const Config) !void { pub fn deinit() void { fern.trace().ctx("maivi.deinit").log(); - fern.deinit(); router.deinit(); -- 2.51.2