cli: Use proper logging

Changes

3 changed files (+31/-17)

• cli/src/commands/server/find.zig
  • @@ -62,44 +62,39 @@ return ExitCode.ok;
    } const server_id = res.positionals[0] orelse { - stderr.print("server_id is required.\n", .{}) catch {}; + std.log.err("server_id is required.", .{}); clap.help(stderr, clap.Help, &params, .{}) catch {}; return ExitCode.incorrect_usage; }; const scanner = core.server.ServerScanner.make() orelse { - // TODO: Print as error log - stderr.print("Unable to create a scanner: out of memory\n", .{}) catch {}; + std.log.err("Unable to create a scanner: out of memory", .{}); // TODO: Create dedicated exit code. return ExitCode.not_ok; }; defer scanner.free(); const server_id_cstr = allocator.dupeZ(u8, server_id) catch { - // TODO: Print as error log - stderr.print("Unable to find server: out of memory\n", .{}) catch {}; + std.log.err("Unable to find server: out of memory", .{}); // TODO: Create dedicated exit code. return ExitCode.not_ok; }; defer allocator.free(server_id_cstr); var result = scanner.find(server_id_cstr.ptr, server_id_cstr.len) orelse { - // TODO: Print as error log - stderr.print("Unable to find server: out of memory\n", .{}) catch {}; + std.log.err("Unable to find server: out of memory", .{}); // TODO: Create dedicated exit code. return ExitCode.not_ok; }; defer result.free(); if (result.code != .ok) { - // TODO: Print as error log - stderr.print("Failed to find server: {s}\n", .{@tagName(result.code)}) catch {}; + std.log.err("Failed to find server: {s}", .{@tagName(result.code)}); return ExitCode.not_ok; } const found = result.server orelse { - // TODO: Print as error log - stderr.print("Server not found\n", .{}) catch {}; + std.log.err("Server not found", .{}); // TODO: Create dedicated exit code. return ExitCode.not_ok; };
• cli/src/commands/server/list.zig
  • @@ -65,7 +65,6 @@ const count = res.args.count orelse 3;
    const wait = res.args.wait orelse 2; const stdout = std.io.getStdOut().writer(); - const stderr = std.io.getStdErr().writer(); var opts: core.server.ScanOptions = undefined; opts.init();
  • @@ -74,21 +73,19 @@ opts.receive_window_ms = wait * 1_000;
    const maybe_scanner = core.server.ServerScanner.make(); const scanner = maybe_scanner orelse { - // TODO: Print as error log - stderr.print("Unable to create a scanner: out of memory\n", .{}) catch {}; + std.log.err("Unable to create a scanner: out of memory", .{}); return ExitCode.not_ok; }; defer scanner.free(); var result = scanner.scan(&opts) orelse { - // TODO: Print as error log - stderr.print("Unable to scan: out of memory\n", .{}) catch {}; + std.log.err("Unable to scan: out of memory", .{}); return ExitCode.not_ok; }; defer result.free(); if (result.code != .ok) { - stderr.print("Failed to scan: {s}\n", .{@tagName(result.code)}) catch {}; + std.log.err("Failed to scan: {s}", .{@tagName(result.code)}); return ExitCode.not_ok; }
• cli/src/main.zig
  • @@ -27,6 +27,24 @@ const playback = @import("./commands/playback.zig");
    const version = "0.0.0"; + pub const std_options = std.Options{ + .log_level = .debug, + .logFn = log, + }; + + var log_level: std.log.Level = .debug; + + pub fn log( + comptime level: std.log.Level, + comptime scope: @Type(.enum_literal), + comptime format: []const u8, + args: anytype, + ) void { + if (@intFromEnum(level) <= @intFromEnum(log_level)) { + std.log.defaultLog(level, scope, format, args); + } + } + const Commands = enum { server, register,
  • @@ -38,10 +56,12 @@ const global_parser = .{
    .command = clap.parsers.enumeration(Commands), .id = clap.parsers.string, .path = clap.parsers.string, + .level = clap.parsers.enumeration(std.log.Level), }; const global_params = clap.parseParamsComptime( \\-h, --help Prints this message to stdout and exits. + \\-l, --log-level <level> Log level to output. \\-v, --verbose Enables debug logging. \\-c, --core-id <id> Roon Server's ID. \\-s, --state <path> Path to state file to load from and save to.
  • @@ -87,6 +107,8 @@ diag.report(std.io.getStdErr().writer(), err) catch {};
    return @intFromEnum(ExitCode.incorrect_usage); }; defer res.deinit(); + + log_level = res.args.@"log-level" orelse .info; if (res.args.help > 0) { clap.help(std.io.getStdOut().writer(), clap.Help, &global_params, .{}) catch {};