Skip to content

fix: add more logs to the exit path #926

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.

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 2 commits into from
Apr 10, 2025
Merged
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
50 changes: 40 additions & 10 deletions src/server/server.ts
Original file line number Diff line number Diff line change
Expand Up @@ -154,28 +154,58 @@ if (EXPORT_DOCS) {
} else if (GENERATE_TYPES) {
console.log(await getTypeOutput())
} else {
const closeListeners = closeWithGrace(async ({ err }) => {
const closeListeners = closeWithGrace(async ({ err, signal, manual }) => {
if (err) {
app.log.error(err)
app.log.error({ err }, 'server closing with error')
} else {
app.log.error(
{ err: new Error('Signal Received') },
`${signal} signal received, server closing, close manual received: ${manual}`
)
}
try {
await app.close()
} catch (err) {
app.log.error({ err }, `Failed to close app`)
throw err
}
try {
await adminApp.close()
} catch (err) {
app.log.error({ err }, `Failed to close adminApp`)
throw err
}
await app.close()
await adminApp.close()
})
app.addHook('onClose', async () => {
closeListeners.uninstall()
await adminApp.close()
try {
closeListeners.uninstall()
await adminApp.close()
} catch (err) {
app.log.error({ err }, `Failed to close adminApp in app onClose hook`)
throw err
}
})
adminApp.addHook('onClose', async () => {
closeListeners.uninstall()
await app.close()
try {
closeListeners.uninstall()
await app.close()
} catch (err) {
app.log.error({ err }, `Failed to close app in adminApp onClose hook`)
throw err
}
})

app.listen({ port: PG_META_PORT, host: PG_META_HOST }, (err) => {
if (err) {
app.log.error(err)
app.log.error({ err }, 'Uncaught error in app, exit(1)')
process.exit(1)
}
const adminPort = PG_META_PORT + 1
adminApp.listen({ port: adminPort, host: PG_META_HOST })
adminApp.listen({ port: adminPort, host: PG_META_HOST }, (err) => {
if (err) {
app.log.error({ err }, 'Uncaught error in adminApp, exit(1)')
process.exit(1)
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note

This one I'm not sure, should we exit 1 in such case ? It seems like this would happen anyways since we'll pass by the hook 'onClose' 🤔

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let’s leave them in just to be safe?

}
})
})
}