mirrors/zits
1
0
Fork 0
mirror of https://git.robbyzambito.me/zits synced 2026-02-04 11:44:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Better cancelation handling

Browse Source 
Based on this conversation with Andrew
https://ziggit.dev/t/am-i-canceling-my-std-io-group-incorrectly/13836
This commit is contained in:
Robby Zambito
2026-01-06 20:48:10 -05:00
parent b87412ee66
commit cc03631838
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Server.zig
View File

@@ -131,7 +131,8 @@ fn handleConnectionInfallible(
) !void { ) !void {
handleConnection(server, server_allocator, io, id, stream, r_buf_size, w_buf_size) catch |err| switch (err) { handleConnection(server, server_allocator, io, id, stream, r_buf_size, w_buf_size) catch |err| switch (err) {
error.Canceled => return error.Canceled, error.Canceled => return error.Canceled,
else => log.err("Failed processing client {d}: {any}", .{ id, err }), error.ClientDisconnected => log.debug("Client {d} disconnected", .{id}),
else => log.err("Failed processing client {d}: {t}", .{ id, err }),
}; };
} }
@@ -235,13 +236,9 @@ fn handleConnection(
}, },
} }
} else |err| switch (err) { } else |err| switch (err) {
error.EndOfStream, error.ReadFailed => { error.EndOfStream => return error.ClientDisconnected,
log.debug("Client {d} disconnected", .{id}); error.ReadFailed => return reader.err.?,
return error.Canceled; else => |e| return e,
},
else => {
return err;
},
} }
} }