1
0
mirror of https://git.tuxpa.in/a/code-server.git synced 2024-12-27 04:35:25 +00:00

heart.ts: Fix leak when server closes

This had me very confused for quite a while until I did a binary search
inspection on route/index.ts. Only with the heart.beat line commented
out did my tests pass without leaking.

They weren't leaking fds but just this heartbeat timer and node of
course prints just fds that are active when it detects some sort of leak
I guess and that made the whole thing very confusing. These fds are not
leaked and will close when node's event loop detects there are no more
callbacks to run.

no of handles 3

tcp stream {
  fd: 20,
  readable: false,
  writable: true,
  address: {},
  serverAddr: null
}

tcp stream {
  fd: 22,
  readable: false,
  writable: true,
  address: {},
  serverAddr: null
}

tcp stream {
  fd: 23,
  readable: true,
  writable: false,
  address: {},
  serverAddr: null
}

It kept printing the above text again and again for 60s and then the
test binary times out I think. I'm not sure if it was node printing the
stuff above or if it was a mocha thing. But it was really confusing...

cc @code-asher for thoughts on what was going on.

edit: It was the leaked-handles import in socket.test.ts!!!
Not sure if we should keep it, this was really confusing and misleading.
This commit is contained in:
Anmol Sethi 2021-01-18 08:30:00 -05:00
parent 5c06646f58
commit c32d8b155f
No known key found for this signature in database
GPG Key ID: 8CEF1878FF10ADEB
3 changed files with 14 additions and 0 deletions

View File

@ -45,4 +45,13 @@ export class Heart {
}) })
}, this.heartbeatInterval) }, this.heartbeatInterval)
} }
/**
* Call to clear any heartbeatTimer for shutdown.
*/
public dispose(): void {
if (typeof this.heartbeatTimer !== "undefined") {
clearTimeout(this.heartbeatTimer)
}
}
} }

View File

@ -55,6 +55,9 @@ export const register = async (
}) })
}) })
}) })
server.on("close", () => {
heart.dispose()
})
app.disable("x-powered-by") app.disable("x-powered-by")
wsApp.disable("x-powered-by") wsApp.disable("x-powered-by")

View File

@ -8,6 +8,8 @@ export async function setup(
argv: string[], argv: string[],
configFile?: string, configFile?: string,
): Promise<[express.Application, express.Application, httpserver.HttpServer, DefaultedArgs]> { ): Promise<[express.Application, express.Application, httpserver.HttpServer, DefaultedArgs]> {
argv = ["--bind-addr=localhost:0", ...argv]
const cliArgs = parse(argv) const cliArgs = parse(argv)
const configArgs = parseConfigFile(configFile || "", "test/integration.ts") const configArgs = parseConfigFile(configFile || "", "test/integration.ts")
const args = await setDefaults(cliArgs, configArgs) const args = await setDefaults(cliArgs, configArgs)