Unverified Commit c878caa3 authored by doinki's avatar doinki Committed by GitHub

Fix to use keep-alive in standalone mode (#50221)

You can specify keepAliveTimeout as an environment variable in
standalone mode, but there is a problem with it not being properly
applied.

#46052 

#### before
<img width="574" alt="2023-05-24 12 49 12"
src="https://github.com/vercel/next.js/assets/90969158/9014252e-dcac-4b32-805a-68e844e853b1">
<img width="574" alt="2023-05-24 12 49 20"
src="https://github.com/vercel/next.js/assets/90969158/8c5672b2-8af8-4751-aa0c-7347428c3cbb">

#### after

<img width="574" alt="2023-05-24 1 19 12"
src="https://github.com/vercel/next.js/assets/90969158/96a83b0d-1dd1-45b7-b053-e0103185dd47">
parent ce483fd7
...@@ -1955,6 +1955,10 @@ if (!process.env.NEXT_MANUAL_SIG_HANDLE) { ...@@ -1955,6 +1955,10 @@ if (!process.env.NEXT_MANUAL_SIG_HANDLE) {
const currentPort = parseInt(process.env.PORT, 10) || 3000 const currentPort = parseInt(process.env.PORT, 10) || 3000
const hostname = process.env.HOSTNAME || 'localhost' const hostname = process.env.HOSTNAME || 'localhost'
const keepAliveTimeout = parseInt(process.env.KEEP_ALIVE_TIMEOUT, 10); const keepAliveTimeout = parseInt(process.env.KEEP_ALIVE_TIMEOUT, 10);
const isValidKeepAliveTimeout =
!Number.isNaN(keepAliveTimeout) &&
Number.isFinite(keepAliveTimeout) &&
keepAliveTimeout >= 0;
const nextConfig = ${JSON.stringify({ const nextConfig = ${JSON.stringify({
...serverConfig, ...serverConfig,
distDir: `./${path.relative(dir, distDir)}`, distDir: `./${path.relative(dir, distDir)}`,
...@@ -1967,6 +1971,7 @@ createServerHandler({ ...@@ -1967,6 +1971,7 @@ createServerHandler({
hostname, hostname,
dir, dir,
conf: nextConfig, conf: nextConfig,
keepAliveTimeout: isValidKeepAliveTimeout ? keepAliveTimeout : undefined,
}).then((nextHandler) => { }).then((nextHandler) => {
const server = http.createServer(async (req, res) => { const server = http.createServer(async (req, res) => {
try { try {
...@@ -1978,13 +1983,10 @@ createServerHandler({ ...@@ -1978,13 +1983,10 @@ createServerHandler({
} }
}) })
if ( if (isValidKeepAliveTimeout) {
!Number.isNaN(keepAliveTimeout) &&
Number.isFinite(keepAliveTimeout) &&
keepAliveTimeout >= 0
) {
server.keepAliveTimeout = keepAliveTimeout server.keepAliveTimeout = keepAliveTimeout
} }
server.listen(currentPort, async (err) => { server.listen(currentPort, async (err) => {
if (err) { if (err) {
console.error("Failed to start server", err) console.error("Failed to start server", err)
......
...@@ -11,12 +11,14 @@ export const createServerHandler = async ({ ...@@ -11,12 +11,14 @@ export const createServerHandler = async ({
dir, dir,
dev = false, dev = false,
minimalMode, minimalMode,
keepAliveTimeout,
}: { }: {
port: number port: number
hostname: string hostname: string
dir: string dir: string
dev?: boolean dev?: boolean
minimalMode: boolean minimalMode: boolean
keepAliveTimeout?: number
}) => { }) => {
const routerWorker = new Worker(require.resolve('./render-server'), { const routerWorker = new Worker(require.resolve('./render-server'), {
numWorkers: 1, numWorkers: 1,
...@@ -65,6 +67,7 @@ export const createServerHandler = async ({ ...@@ -65,6 +67,7 @@ export const createServerHandler = async ({
minimalMode, minimalMode,
workerType: 'router', workerType: 'router',
isNodeDebugging: false, isNodeDebugging: false,
keepAliveTimeout,
}) })
didInitialize = true didInitialize = true
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment