From a0eb5800fd1876e9faa3bc0efc7a7269438bd0b6 Mon Sep 17 00:00:00 2001 From: Rani Pinchuk Date: Fri, 3 Nov 2017 16:53:45 +0100 Subject: [PATCH 1/2] Catch incorrect header exceptions --- src/serve_rendered.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/serve_rendered.js b/src/serve_rendered.js index cdd4296..1fc3212 100644 --- a/src/serve_rendered.js +++ b/src/serve_rendered.js @@ -188,7 +188,12 @@ module.exports = function(options, repo, params, id, dataResolver) { } if (format == 'pbf') { - response.data = zlib.unzipSync(data); + try { + response.data = zlib.unzipSync(data); + } + catch (err) { + console.log("Skipping incorrect header for tile mbtiles://openmaptiles/%z/%x/%y.pbf", z, x, y); + } if (options.dataDecoratorFunc) { response.data = options.dataDecoratorFunc( sourceId, 'data', response.data, z, x, y); From 81f65af3a87d78af2741740d2139d708fac3a893 Mon Sep 17 00:00:00 2001 From: Rani Pinchuk Date: Thu, 9 Nov 2017 18:00:41 +0100 Subject: [PATCH 2/2] Fix log message when incorrect header exception is caught --- src/serve_rendered.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/serve_rendered.js b/src/serve_rendered.js index 1fc3212..aca8295 100644 --- a/src/serve_rendered.js +++ b/src/serve_rendered.js @@ -192,7 +192,7 @@ module.exports = function(options, repo, params, id, dataResolver) { response.data = zlib.unzipSync(data); } catch (err) { - console.log("Skipping incorrect header for tile mbtiles://openmaptiles/%z/%x/%y.pbf", z, x, y); + console.log("Skipping incorrect header for tile mbtiles://%s/%s/%s/%s.pbf", id, z, x, y); } if (options.dataDecoratorFunc) { response.data = options.dataDecoratorFunc(