Skip to content

Commit d23605d

Browse files
authoredMar 15, 2023
fix(server): should close server after create new server (#12379)
1 parent 96f36a9 commit d23605d

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed
 

‎packages/vite/src/node/optimizer/index.ts

+5-2
Original file line numberDiff line numberDiff line change
@@ -1296,8 +1296,11 @@ export async function cleanupDepsCacheStaleDirs(
12961296
for (const dirent of dirents) {
12971297
if (dirent.isDirectory() && dirent.name.includes('_temp_')) {
12981298
const tempDirPath = path.resolve(config.cacheDir, dirent.name)
1299-
const { mtime } = await fsp.stat(tempDirPath)
1300-
if (Date.now() - mtime.getTime() > MAX_TEMP_DIR_AGE_MS) {
1299+
const stats = await fsp.stat(tempDirPath).catch((_) => null)
1300+
if (
1301+
stats?.mtime &&
1302+
Date.now() - stats.mtime.getTime() > MAX_TEMP_DIR_AGE_MS
1303+
) {
13011304
await removeDir(tempDirPath)
13021305
}
13031306
}

‎packages/vite/src/node/server/index.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,6 @@ async function restartServer(server: ViteDevServer) {
816816
const { port: prevPort, host: prevHost } = server.config.server
817817
const shortcutsOptions: BindShortcutsOptions = server._shortcutsOptions
818818
const oldUrls = server.resolvedUrls
819-
await server.close()
820819

821820
let inlineConfig = server.config.inlineConfig
822821
if (server._forceOptimizeOnRestart) {
@@ -834,9 +833,12 @@ async function restartServer(server: ViteDevServer) {
834833
server.config.logger.error(err.message, {
835834
timestamp: true,
836835
})
836+
server.config.logger.error('server restart failed', { timestamp: true })
837837
return
838838
}
839839

840+
await server.close()
841+
840842
// prevent new server `restart` function from calling
841843
newServer._restartPromise = server._restartPromise
842844

0 commit comments

Comments
 (0)
Please sign in to comment.