From b6e2d101eb4254c285d313e6f561bfe02a7f8d51 Mon Sep 17 00:00:00 2001 From: Andrew Calcutt Date: Fri, 28 Oct 2022 11:53:21 -0400 Subject: [PATCH] Fix HUP kill not reloading config (#630) * try to fix HUP config reset * remove..outdated?.. require.cache --- package.json | 2 +- src/server.js | 8 ++------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 2a977d3..a037263 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tileserver-gl", - "version": "4.1.1", + "version": "4.1.2", "description": "Map tile server for JSON GL styles - vector and server side generated raster tiles", "main": "src/main.js", "bin": "src/main.js", diff --git a/src/server.js b/src/server.js index b472e9f..144f446 100644 --- a/src/server.js +++ b/src/server.js @@ -30,7 +30,7 @@ const packageJson = JSON.parse(fs.readFileSync(__dirname + '/../package.json', ' const isLight = packageJson.name.slice(-6) === '-light'; const serve_rendered = (await import(`${!isLight ? `./serve_rendered.js` : `./serve_light.js`}`)).serve_rendered; -export function server(opts) { +function start(opts) { console.log('Starting server'); const app = express().disable('x-powered-by'); @@ -502,7 +502,7 @@ export function server(opts) { }; } -export const exports = (opts) => { +export function server(opts) { const running = start(opts); running.startupPromise.catch((err) => { @@ -518,10 +518,6 @@ export const exports = (opts) => { console.log('Stopping server and reloading config'); running.server.shutdown(() => { - for (const key in require.cache) { - delete require.cache[key]; - } - const restarted = start(opts); running.server = restarted.server; running.app = restarted.app;