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

fix(config): improve error handling in config file reader

Browse source 
closes #133
This commit is contained in:
CJ van den Berg 2025-01-08 21:19:08 +01:00
parent 5b2198b313
commit 4f5eb15392
Signed by: neurocyte
GPG key ID: 8EB1E1BB660E3FB9
1 changed files with 23 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/main.zig
View file

@ -407,8 +407,8 @@ pub fn read_config(T: type, allocator: std.mem.Allocator) struct { T, [][]const
} }
fn read_config_file(T: type, allocator: std.mem.Allocator, conf: *T, bufs: *[][]const u8, file_name: []const u8) void { fn read_config_file(T: type, allocator: std.mem.Allocator, conf: *T, bufs: *[][]const u8, file_name: []const u8) void {
read_json_config_file(T, allocator, conf, bufs, file_name) catch |e| read_json_config_file(T, allocator, conf, bufs, file_name) catch
std.log.err("error reading config file '{s}' {any}", .{ file_name, e }); std.log.err("error reading config file '{s}'", .{file_name});
return; return;
} }
@ -430,23 +430,38 @@ fn read_json_config_file(T: type, allocator: std.mem.Allocator, conf: *T, bufs_:
var len = try cbor.decodeMapHeader(&iter); var len = try cbor.decodeMapHeader(&iter);
while (len > 0) : (len -= 1) { while (len > 0) : (len -= 1) {
var field_name: []const u8 = undefined; var field_name: []const u8 = undefined;
var known = false;
if (!(try cbor.matchString(&iter, &field_name))) return error.InvalidConfig; if (!(try cbor.matchString(&iter, &field_name))) return error.InvalidConfig;
inline for (@typeInfo(T).Struct.fields) |field_info| inline for (@typeInfo(T).Struct.fields) |field_info|
if (comptime std.mem.eql(u8, "include_files", field_info.name)) { if (comptime std.mem.eql(u8, "include_files", field_info.name)) {
if (std.mem.eql(u8, field_name, field_info.name)) { if (std.mem.eql(u8, field_name, field_info.name)) {
known = true;
var value: field_info.type = undefined; var value: field_info.type = undefined;
if (!(try cbor.matchValue(&iter, cbor.extract(&value)))) return error.InvalidConfig; if (try cbor.matchValue(&iter, cbor.extract(&value))) {
if (conf.include_files.len > 0) { if (conf.include_files.len > 0) {
std.log.err("{s}: ignoring nested 'include_files' value '{s}'", .{ file_name, value }); std.log.err("{s}: ignoring nested 'include_files' value '{s}'", .{ file_name, value });
} else {
@field(conf, field_info.name) = value;
}
} else { } else {
@field(conf, field_info.name) = value; try cbor.skipValue(&iter);
std.log.err("invalid value for key '{s}'", .{field_name});
} }
} }
} else if (std.mem.eql(u8, field_name, field_info.name)) { } else if (std.mem.eql(u8, field_name, field_info.name)) {
known = true;
var value: field_info.type = undefined; var value: field_info.type = undefined;
if (!(try cbor.matchValue(&iter, cbor.extract(&value)))) return error.InvalidConfig; if (try cbor.matchValue(&iter, cbor.extract(&value))) {
@field(conf, field_info.name) = value; @field(conf, field_info.name) = value;
} else {
try cbor.skipValue(&iter);
std.log.err("invalid value for key '{s}'", .{field_name});
}
}; };
if (!known) {
try cbor.skipValue(&iter);
std.log.err("unknown config value '{s}' ignored", .{field_name});
}
} }
} }