heartles/fediglam
1
1
Fork 0
Code Issues 64 Pull requests Projects Releases Packages Wiki Activity

Log errors instead of panic

Browse source
This commit is contained in:
jaina heartles 2022-08-01 23:24:16 -07:00
parent bdd2d48a87
commit 9c94cafe95
3 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/main/controllers.zig
View file

@ -45,8 +45,10 @@ pub const utils = struct {
try stream.finish(); try stream.finish();
} }
pub fn respondError(ctx: *http.server.Context, status: http.Status, err: []const u8) !void { pub fn respondError(ctx: *http.server.Context, status: http.Status, err: []const u8) void {
return respondJson(ctx, status, .{ .@"error" = err }); respondJson(ctx, status, .{ .@"error" = err }) catch |write_err| {
std.log.err("Unable to print error: {}", .{write_err});
};
} }
pub fn parseRequestBody(comptime T: type, ctx: *http.server.Context) !T { pub fn parseRequestBody(comptime T: type, ctx: *http.server.Context) !T {
@ -87,5 +89,9 @@ pub fn healthcheck(_: *RequestServer, ctx: *http.server.Context, _: RouteArgs) !
} }
pub fn notFound(_: *RequestServer, ctx: *http.server.Context) void { pub fn notFound(_: *RequestServer, ctx: *http.server.Context) void {
utils.respondError(ctx, .not_found, "Not Found") catch unreachable; utils.respondError(ctx, .not_found, "Not Found");
}
pub fn internalServerError(_: *RequestServer, ctx: *http.server.Context) void {
utils.respondError(ctx, .internal_server_error, "Internal Server Error");
} }

2
src/main/controllers/auth.zig
View file

@ -18,7 +18,7 @@ pub fn register(srv: *RequestServer, ctx: *http.server.Context, _: RouteArgs) !v
defer api.close(); defer api.close();
const user = api.register(info) catch |err| switch (err) { const user = api.register(info) catch |err| switch (err) {
error.UsernameUnavailable => return try utils.respondError(ctx, .bad_request, "Username Unavailable"), error.UsernameUnavailable => return utils.respondError(ctx, .bad_request, "Username Unavailable"),
else => return err, else => return err,
}; };

5
src/main/main.zig
View file

@ -62,7 +62,10 @@ pub const RequestServer = struct {
router.dispatch(self, &ctx, ctx.request.method, ctx.request.path) catch |err| switch (err) { router.dispatch(self, &ctx, ctx.request.method, ctx.request.path) catch |err| switch (err) {
error.NotFound, error.RouteNotApplicable => c.notFound(self, &ctx), error.NotFound, error.RouteNotApplicable => c.notFound(self, &ctx),
else => return err, else => {
std.log.err("Unhandled error in controller ({s}): {}", .{ ctx.request.path, err });
c.internalServerError(self, &ctx);
},
}; };
} }
} }