fix: Listening events (#7474)

* fix: Listening events

* cleanup
This commit is contained in:
Adrien de Peretti authored and GitHub committed 2024-05-27 15:31:57 +02:00
1 parent 10ef32c5a3
commit 45bcdfec17
4 files changed
+25 -26

No files matched your search

+9 -7
View File
@@ -63,15 +63,17 @@ module.exports = {
} }
return await new Promise((resolve, reject) => { return await new Promise((resolve, reject) => {
expressServer = app.listen(port, async (err) => { expressServer = app
if (err) { .listen(port)
.on("error", async (err) => {
await shutdown() await shutdown()
return reject(err) return reject(err)
} })
setPort(port) .on("listening", () => {
process.send(port) setPort(port)
resolve(shutdown) process.send(port)
}) resolve(shutdown)
})
setExpressServer(expressServer) setExpressServer(expressServer)
}) })
@@ -60,18 +60,21 @@ export async function startApp({
} }
return await new Promise((resolve, reject) => { return await new Promise((resolve, reject) => {
const server = app.listen(port).on("error", async (err) => { const server = app
await shutdown() .listen(port)
return reject(err) .on("error", async (err) => {
}) await shutdown()
return reject(err)
})
.on("listening", () => {
process.send?.(port)
process.send?.(port) resolve({
shutdown,
resolve({ container,
shutdown, port,
container, })
port, })
})
// TODO: fix that once we find the appropriate place to put this util // TODO: fix that once we find the appropriate place to put this util
const { const {
@@ -61,10 +61,7 @@ export default async function ({ port, cpus, directory }) {
}) })
const serverActivity = Logger.activity(`Creating server`) const serverActivity = Logger.activity(`Creating server`)
const server = GracefulShutdownServer.create( const server = GracefulShutdownServer.create(
app.listen(port).on("error", (err) => { app.listen(port).on("listening", () => {
if (err) {
return
}
Logger.success(serverActivity, `Server is ready on port: ${port}`) Logger.success(serverActivity, `Server is ready on port: ${port}`)
track("CLI_START_COMPLETED") track("CLI_START_COMPLETED")
}) })
+1 -4
View File
@@ -26,10 +26,7 @@ export default async function ({ port, directory }) {
const serverActivity = Logger.activity(`Creating server`) const serverActivity = Logger.activity(`Creating server`)
const server = GracefulShutdownServer.create( const server = GracefulShutdownServer.create(
app.listen(port).on("error", (err) => { app.listen(port).on("listening", () => {
if (err) {
return
}
Logger.success(serverActivity, `Server is ready on port: ${port}`) Logger.success(serverActivity, `Server is ready on port: ${port}`)
track("CLI_START_COMPLETED") track("CLI_START_COMPLETED")
}) })