Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion frameworks/dusty-std/build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ pub fn build(b: *std.Build) void {
const dusty = b.dependency("dusty", .{
.target = target,
.optimize = optimize,
.use_tls = false,
});
exe.root_module.addImport("dusty", dusty.module("dusty"));
b.installArtifact(exe);
Expand Down
4 changes: 2 additions & 2 deletions frameworks/dusty-std/build.zig.zon
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
.minimum_zig_version = "0.16.0",
.dependencies = .{
.dusty = .{
.url = "git+https://github.com/lalinsky/dusty#v0.3.0",
.hash = "dusty-0.3.0-Qdw7RuMmIADEfIvweBs3lT1-8DL2W0iR4V3PlYrkeiX2",
.url = "git+https://github.com/lalinsky/dusty?ref=v0.6.0#102b0c76eee2ed9c0ea3fff199473a7d731eb258",
.hash = "dusty-0.6.0-Qdw7RhVxJgA6uMKSP4-Ll-7uj8fkY7BJQ9VcRFMAFVk0",
},
},
.paths = .{
Expand Down
16 changes: 8 additions & 8 deletions frameworks/dusty-std/main.zig
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,15 @@ pub fn main(init: std.process.Init) !void {
});
defer threaded.deinit();

const listeners = [_]http.Listener{.{
.address = .{ .ip = try std.Io.net.IpAddress.parse("0.0.0.0", shared_mod.port) },
.reuse_address = true,
.kernel_backlog = shared_mod.connection_count,
}};

var server = http.Server(void).init(init.gpa, threaded.io(), .{
.max_connections = shared_mod.connection_count,
.listen = .{
.reuse_address = true,
.kernel_backlog = shared_mod.connection_count,
},
.listeners = &listeners,
.timeout = .{
.request = null,
.keepalive = null,
Expand All @@ -27,11 +30,8 @@ pub fn main(init: std.process.Init) !void {
server.router.get("/api/users", users);
server.router.get("/api/users/:id", user);

const addr: http.Address = .{
.ip = try std.Io.net.IpAddress.parse("0.0.0.0", shared_mod.port),
};
std.debug.print("Started on port {d}\n", .{shared_mod.port});
try server.listen(addr);
try server.run();
}

fn root(_: *http.Request, res: *http.Response) !void {
Expand Down
1 change: 0 additions & 1 deletion frameworks/dusty-zio/build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ pub fn build(b: *std.Build) void {
const dusty_dep = b.dependency("dusty", .{
.target = target,
.optimize = optimize,
.use_tls = false,
});
// Prefer zio's AutoCancel timeouts over dusty's portable std.Io stub.
const dusty_mod = dusty_dep.module("dusty");
Expand Down
8 changes: 4 additions & 4 deletions frameworks/dusty-zio/build.zig.zon
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
.minimum_zig_version = "0.16.0",
.dependencies = .{
.dusty = .{
.url = "git+https://github.com/lalinsky/dusty#v0.3.0",
.hash = "dusty-0.3.0-Qdw7RuMmIADEfIvweBs3lT1-8DL2W0iR4V3PlYrkeiX2",
.url = "git+https://github.com/lalinsky/dusty?ref=v0.6.0#102b0c76eee2ed9c0ea3fff199473a7d731eb258",
.hash = "dusty-0.6.0-Qdw7RhVxJgA6uMKSP4-Ll-7uj8fkY7BJQ9VcRFMAFVk0",
},
.zio = .{
.url = "git+https://github.com/lalinsky/zio#417757935ef6d0f0a2396d4023a44ca82ac1901c",
.hash = "zio-0.18.0-xHbVVELgKQAU2hnwYL9MA0iXUydUZYlBfXxOUUM6v_Uv",
.url = "git+https://github.com/lalinsky/zio?ref=v0.20.1#c0a6b5877c9bbc71d2d2c0b3374ce7fa61a4ec12",
.hash = "zio-0.20.1-xHbVVI0wLwDgE2dXWDCWH0UfCQYEhnBYHs1Td12oAGeR",
},
},
.paths = .{
Expand Down
16 changes: 8 additions & 8 deletions frameworks/dusty-zio/main.zig
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,15 @@ pub fn main(init: std.process.Init) !void {
});
defer rt.deinit();

const listeners = [_]http.Listener{.{
.address = .{ .ip = try std.Io.net.IpAddress.parse("0.0.0.0", shared_mod.port) },
.reuse_address = true,
.kernel_backlog = shared_mod.connection_count,
}};

var server = http.Server(void).init(init.gpa, rt.io(), .{
.max_connections = shared_mod.connection_count,
.listen = .{
.reuse_address = true,
.kernel_backlog = shared_mod.connection_count,
},
.listeners = &listeners,
.timeout = .{
.request = null,
.keepalive = null,
Expand All @@ -27,11 +30,8 @@ pub fn main(init: std.process.Init) !void {
server.router.get("/api/users", users);
server.router.get("/api/users/:id", user);

const addr: http.Address = .{
.ip = try std.Io.net.IpAddress.parse("0.0.0.0", shared_mod.port),
};
std.debug.print("Started on port {d} (zio, {d} threads)\n", .{ shared_mod.port, shared_mod.thread_count });
try server.listen(addr);
try server.run();
}

fn root(_: *http.Request, res: *http.Response) !void {
Expand Down
Loading