mirrors/bun.sh
1
0
Fork 0
mirror of https://github.com/oven-sh/bun synced 2026-02-09 10:28:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

add server scheduleDeinit, ignore logs in test

Browse Source
This commit is contained in:
Dylan Conway
2022-12-06 17:09:21 -08:00
parent 58185e139a
commit 5f3a6f2bf3
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/bun.js/api/server.zig
View File

@@ -3804,7 +3804,7 @@ pub fn NewServer(comptime ssl_enabled_: bool, comptime debug_mode_: bool) type {
listen_callback: JSC.AnyTask = undefined,
allocator: std.mem.Allocator,
poll_ref: JSC.PollRef = .{},
deinit_scheduled: bool = false,
temporary_url_buffer: std.ArrayListUnmanaged(u8) = .{},
pub const Class = JSC.NewClass(
@@ -4291,7 +4291,7 @@ pub fn NewServer(comptime ssl_enabled_: bool, comptime debug_mode_: bool) type {
ws.handler.app = null;
}
this.unref();
this.deinit();
this.scheduleDeinit();
}
}
@@ -4307,6 +4307,16 @@ pub fn NewServer(comptime ssl_enabled_: bool, comptime debug_mode_: bool) type {
this.deinitIfWeCan();
}
pub fn scheduleDeinit(this: *ThisServer) void {
if (this.deinit_scheduled)
return;
this.deinit_scheduled = true;
httplog("scheduleDeinit", .{});
var task = bun.default_allocator.create(JSC.AnyTask) catch unreachable;
task.* = JSC.AnyTask.New(ThisServer, deinit).init(this);
this.vm.enqueueTask(JSC.Task.init(task));
}
pub fn deinit(this: *ThisServer) void {
httplog("deinit", .{});
this.app.destroy();

10
test/bun.js/process-args.test.js
View File

@@ -4,34 +4,32 @@ import { test, expect } from "bun:test";
test("args exclude run", async () => {
const arg0 = process.argv[0];
const arg1 = import.meta.dir + "/print-process-args.js";
const exe = process.versions.bun.includes("debug") ? "bun-debug" : "bun";
const { stdout: s1 } = spawn([exe, "print-process-args.js"], {
cwd: import.meta.dir,
env: { BUN_DEBUG_QUIET_LOGS: "1" },
});
const t1 = JSON.parse(await new Response(s1).text());
expect(t1[0]).toBe(arg0);
expect(t1[1]).toBe(arg1);
const { stdout: s2 } = spawn([exe, "print-process-args.js", "arg1"], {
cwd: import.meta.dir,
env: { BUN_DEBUG_QUIET_LOGS: "1" },
});
const t2 = JSON.parse(await new Response(s2).text());
expect(t2[0]).toBe(arg0);
expect(t2[1]).toBe(arg1);
expect(t2[2]).toBe("arg1");
const { stdout: s3 } = spawn([exe, "run", "print-process-args.js"], {
cwd: import.meta.dir,
env: { BUN_DEBUG_QUIET_LOGS: "1" },
});
const t3 = JSON.parse(await new Response(s3).text());
expect(t3[0]).toBe(arg0);
expect(t3[1]).toBe(arg1);
const { stdout: s4 } = spawn(
[exe, "run", "print-process-args.js", "arg1", "arg2"],
{ cwd: import.meta.dir },
{ cwd: import.meta.dir, env: { BUN_DEBUG_QUIET_LOGS: "1" } },
);
const t4 = JSON.parse(await new Response(s4).text());
expect(t4[0]).toBe(arg0);