Skip to content

Commit b2debd2

Browse files
thomasneirynckthomasneirynck
committed
fix server log
1 parent e28e149 commit b2debd2

1 file changed

Lines changed: 26 additions & 15 deletions

File tree

‎x-pack/legacy/plugins/maps/server/routes.js‎

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,8 @@ export function initRoutes(server, licenseUid) {
6969
method: 'GET',
7070
path: `${ROOT}/${EMS_FILES_API_PATH}/${EMS_FILES_DEFAULT_JSON_PATH}`,
7171
handler: async request => {
72-
checkEMSProxyConfig();
72+
const { server } = request;
73+
checkEMSProxyConfig(server);
7374

7475
if (!request.query.id) {
7576
server.log('warning', 'Must supply id parameters to retrieve EMS file');
@@ -96,7 +97,8 @@ export function initRoutes(server, licenseUid) {
9697
method: 'GET',
9798
path: `${ROOT}/${EMS_TILES_API_PATH}/${EMS_TILES_RASTER_TILE_PATH}`,
9899
handler: async (request, h) => {
99-
checkEMSProxyConfig();
100+
const { server } = request;
101+
checkEMSProxyConfig(server);
100102

101103
if (
102104
!request.query.id ||
@@ -127,8 +129,9 @@ export function initRoutes(server, licenseUid) {
127129
server.route({
128130
method: 'GET',
129131
path: `${ROOT}/${EMS_CATALOGUE_PATH}`,
130-
handler: async () => {
131-
checkEMSProxyConfig();
132+
handler: async request => {
133+
const { server } = request;
134+
checkEMSProxyConfig(server);
132135

133136
const main = await emsClient.getMainManifest();
134137
const proxiedManifest = {
@@ -157,8 +160,9 @@ export function initRoutes(server, licenseUid) {
157160
server.route({
158161
method: 'GET',
159162
path: `${ROOT}/${EMS_FILES_CATALOGUE_PATH}/{emsVersion}/manifest`,
160-
handler: async () => {
161-
checkEMSProxyConfig();
163+
handler: async request => {
164+
const { server } = request;
165+
checkEMSProxyConfig(server);
162166

163167
const file = await emsClient.getDefaultFileManifest();
164168
const layers = file.layers.map(layer => {
@@ -181,8 +185,9 @@ export function initRoutes(server, licenseUid) {
181185
server.route({
182186
method: 'GET',
183187
path: `${ROOT}/${EMS_TILES_CATALOGUE_PATH}/{emsVersion}/manifest`,
184-
handler: async () => {
185-
checkEMSProxyConfig();
188+
handler: async request => {
189+
const { server } = request;
190+
checkEMSProxyConfig(server);
186191

187192
const tilesManifest = await emsClient.getDefaultTMSManifest();
188193
const newServices = tilesManifest.services.map(service => {
@@ -220,7 +225,8 @@ export function initRoutes(server, licenseUid) {
220225
method: 'GET',
221226
path: `${ROOT}/${EMS_TILES_API_PATH}/${EMS_TILES_RASTER_STYLE_PATH}`,
222227
handler: async request => {
223-
checkEMSProxyConfig();
228+
const { server } = request;
229+
checkEMSProxyConfig(server);
224230

225231
if (!request.query.id) {
226232
server.log('warning', 'Must supply id parameter to retrieve EMS raster style');
@@ -246,7 +252,8 @@ export function initRoutes(server, licenseUid) {
246252
method: 'GET',
247253
path: `${ROOT}/${EMS_TILES_API_PATH}/${EMS_TILES_VECTOR_STYLE_PATH}`,
248254
handler: async request => {
249-
checkEMSProxyConfig();
255+
const { server } = request;
256+
checkEMSProxyConfig(server);
250257

251258
if (!request.query.id) {
252259
server.log('warning', 'Must supply id parameter to retrieve EMS vector style');
@@ -285,7 +292,8 @@ export function initRoutes(server, licenseUid) {
285292
method: 'GET',
286293
path: `${ROOT}/${EMS_TILES_API_PATH}/${EMS_TILES_VECTOR_SOURCE_PATH}`,
287294
handler: async request => {
288-
checkEMSProxyConfig();
295+
const { server } = request;
296+
checkEMSProxyConfig(server);
289297

290298
if (!request.query.id || !request.query.sourceId) {
291299
server.log(
@@ -316,7 +324,8 @@ export function initRoutes(server, licenseUid) {
316324
method: 'GET',
317325
path: `${ROOT}/${EMS_TILES_API_PATH}/${EMS_TILES_VECTOR_TILE_PATH}`,
318326
handler: async (request, h) => {
319-
checkEMSProxyConfig();
327+
const { server } = request;
328+
checkEMSProxyConfig(server);
320329

321330
if (
322331
!request.query.id ||
@@ -352,7 +361,8 @@ export function initRoutes(server, licenseUid) {
352361
method: 'GET',
353362
path: `${ROOT}/${EMS_TILES_API_PATH}/${EMS_GLYPHS_PATH}/{fontstack}/{range}`,
354363
handler: async (request, h) => {
355-
checkEMSProxyConfig();
364+
const { server } = request;
365+
checkEMSProxyConfig(server);
356366
const url = mapConfig.emsFontLibraryUrl
357367
.replace('{fontstack}', request.params.fontstack)
358368
.replace('{range}', request.params.range);
@@ -365,7 +375,8 @@ export function initRoutes(server, licenseUid) {
365375
method: 'GET',
366376
path: `${ROOT}/${EMS_TILES_API_PATH}/${EMS_SPRITES_PATH}/{id}/sprite{scaling?}.{extension}`,
367377
handler: async (request, h) => {
368-
checkEMSProxyConfig();
378+
const { server } = request;
379+
checkEMSProxyConfig(server);
369380

370381
if (!request.params.id) {
371382
server.log('warning', 'Must supply id parameter to retrieve EMS vector source sprite');
@@ -443,7 +454,7 @@ export function initRoutes(server, licenseUid) {
443454
},
444455
});
445456

446-
function checkEMSProxyConfig() {
457+
function checkEMSProxyConfig(server) {
447458
if (!mapConfig.proxyElasticMapsServiceInMaps) {
448459
server.log(
449460
'warning',

0 commit comments

Comments
 (0)