Fabio/tileserver-gl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix HUP kill not reloading config (#630)

Browse source 
* try to fix HUP config reset
* remove..outdated?.. require.cache
This commit is contained in:
Andrew Calcutt 2022-10-28 11:53:21 -04:00 committed by GitHub
parent f3f63498a8
commit b6e2d101eb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "tileserver-gl", "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", "description": "Map tile server for JSON GL styles - vector and server side generated raster tiles",
"main": "src/main.js", "main": "src/main.js",
"bin": "src/main.js", "bin": "src/main.js",

8
src/server.js
View file

@ -30,7 +30,7 @@ const packageJson = JSON.parse(fs.readFileSync(__dirname + '/../package.json', '
const isLight = packageJson.name.slice(-6) === '-light'; const isLight = packageJson.name.slice(-6) === '-light';
const serve_rendered = (await import(`${!isLight ? `./serve_rendered.js` : `./serve_light.js`}`)).serve_rendered; 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'); console.log('Starting server');
const app = express().disable('x-powered-by'); 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); const running = start(opts);
running.startupPromise.catch((err) => { running.startupPromise.catch((err) => {
@ -518,10 +518,6 @@ export const exports = (opts) => {
console.log('Stopping server and reloading config'); console.log('Stopping server and reloading config');
running.server.shutdown(() => { running.server.shutdown(() => {
for (const key in require.cache) {
delete require.cache[key];
}
const restarted = start(opts); const restarted = start(opts);
running.server = restarted.server; running.server = restarted.server;
running.app = restarted.app; running.app = restarted.app;