Skip to content

Limit serve timeout to 1 week #1007

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 4, 2025
Merged

Limit serve timeout to 1 week #1007

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b3d350d
Limit serve timeout to 1 week
karlseguin Sep 4, 2025
6e5fe8e
Add timeout limit to --help text
karlseguin Sep 4, 2025
da128f5
remove unecessary @intCast
karlseguin Sep 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions src/main.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,9 @@ fn run(alloc: Allocator) !void {
const server = &_server.?;
defer server.deinit();

server.run(address, opts.timeout * 1000) catch |err| {
// max timeout of 1 week.
const timeout = if (opts.timeout > 604_800) 604_800_000 else @as(i32, opts.timeout) * 1000;
server.run(address, timeout) catch |err| {
log.fatal(.app, "server run error", .{ .err = err });
return err;
};
Expand Down Expand Up @@ -268,7 +270,7 @@ const Command = struct {
const Serve = struct {
host: []const u8,
port: u16,
timeout: u16,
timeout: u31,
common: Common,
};

Expand Down Expand Up @@ -369,7 +371,7 @@ const Command = struct {
\\ Defaults to 9222
\\
\\--timeout Inactivity timeout in seconds before disconnecting clients
\\ Defaults to 10 (seconds)
\\ Defaults to 10 (seconds). Limited to 604800 (1 week).
\\
++ common_options ++
\\
Expand Down Expand Up @@ -465,7 +467,7 @@ fn parseServeArgs(
) !Command.Serve {
var host: []const u8 = "127.0.0.1";
var port: u16 = 9222;
var timeout: u16 = 10;
var timeout: u31 = 10;
var common: Command.Common = .{};

while (args.next()) |opt| {
Expand Down Expand Up @@ -497,7 +499,7 @@ fn parseServeArgs(
return error.InvalidArgument;
};

timeout = std.fmt.parseInt(u16, str, 10) catch |err| {
timeout = std.fmt.parseInt(u31, str, 10) catch |err| {
log.fatal(.app, "invalid argument value", .{ .arg = "--timeout", .err = err });
return error.InvalidArgument;
};
Expand Down