Skip to content

Fix to use keep-alive in standalone mode #50221

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.

Sign up for GitHub

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
ijjk merged 9 commits into from
Jul 6, 2023
Merged

Fix to use keep-alive in standalone mode #50221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
e787415
Fix to use keep-alive in standalone mode
doinki May 23, 2023
e901d22
Merge branch 'canary' into fix/standalone-keep-alive
doinki May 23, 2023
1d58392
Merge branch 'canary' into fix/standalone-keep-alive
doinki May 24, 2023
720f25b
Merge branch 'canary' into fix/standalone-keep-alive
doinki May 26, 2023
a8d7db6
Merge branch 'canary' into fix/standalone-keep-alive
doinki Jun 25, 2023
8195817
Merge branch 'canary' into fix/standalone-keep-alive
styfle Jun 29, 2023
2c02182
Merge branch 'canary' into fix/standalone-keep-alive
doinki Jul 1, 2023
8d9e1d8
Merge branch 'canary' into fix/standalone-keep-alive
styfle Jul 6, 2023
2d34704
Merge branch 'canary' into fix/standalone-keep-alive
styfle Jul 6, 2023
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
12 changes: 7 additions & 5 deletions packages/next/src/build/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1955,6 +1955,10 @@ if (!process.env.NEXT_MANUAL_SIG_HANDLE) {
const currentPort = parseInt(process.env.PORT, 10) || 3000
const hostname = process.env.HOSTNAME || 'localhost'
const keepAliveTimeout = parseInt(process.env.KEEP_ALIVE_TIMEOUT, 10);
const isValidKeepAliveTimeout =
!Number.isNaN(keepAliveTimeout) &&
Number.isFinite(keepAliveTimeout) &&
keepAliveTimeout >= 0;
const nextConfig = ${JSON.stringify({
...serverConfig,
distDir: `./${path.relative(dir, distDir)}`,
Expand All @@ -1967,6 +1971,7 @@ createServerHandler({
hostname,
dir,
conf: nextConfig,
keepAliveTimeout: isValidKeepAliveTimeout ? keepAliveTimeout : undefined,
}).then((nextHandler) => {
const server = http.createServer(async (req, res) => {
try {
Expand All @@ -1978,13 +1983,10 @@ createServerHandler({
}
})

if (
!Number.isNaN(keepAliveTimeout) &&
Number.isFinite(keepAliveTimeout) &&
keepAliveTimeout >= 0
) {
if (isValidKeepAliveTimeout) {
server.keepAliveTimeout = keepAliveTimeout
}

server.listen(currentPort, async (err) => {
if (err) {
console.error("Failed to start server", err)
Expand Down
3 changes: 3 additions & 0 deletions packages/next/src/server/lib/render-server-standalone.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,14 @@ export const createServerHandler = async ({
dir,
dev = false,
minimalMode,
keepAliveTimeout,
}: {
port: number
hostname: string
dir: string
dev?: boolean
minimalMode: boolean
keepAliveTimeout?: number
}) => {
const routerWorker = new Worker(require.resolve('./render-server'), {
numWorkers: 1,
Expand Down Expand Up @@ -65,6 +67,7 @@ export const createServerHandler = async ({
minimalMode,
workerType: 'router',
isNodeDebugging: false,
keepAliveTimeout,
})
didInitialize = true

Expand Down