Print package version to log and index

This commit is contained in:
Petr Sloup 2016-07-13 14:04:42 +02:00
parent a310c130f3
commit a43c96f6cc
2 changed files with 6 additions and 2 deletions

File diff suppressed because one or more lines are too long

View file

@ -15,13 +15,16 @@ var base64url = require('base64url'),
mercator = new (require('sphericalmercator'))(), mercator = new (require('sphericalmercator'))(),
morgan = require('morgan'); morgan = require('morgan');
var serve_font = require('./serve_font'), var packageJson = require('../package'),
serve_font = require('./serve_font'),
serve_rendered = require('./serve_rendered'), serve_rendered = require('./serve_rendered'),
serve_style = require('./serve_style'), serve_style = require('./serve_style'),
serve_data = require('./serve_data'), serve_data = require('./serve_data'),
utils = require('./utils'); utils = require('./utils');
module.exports = function(opts, callback) { module.exports = function(opts, callback) {
console.log('Starting TileServer-GL v' + packageJson.version);
var app = express().disable('x-powered-by'), var app = express().disable('x-powered-by'),
serving = { serving = {
styles: {}, styles: {},
@ -173,6 +176,7 @@ module.exports = function(opts, callback) {
return res.status(404).send('Not found'); return res.status(404).send('Not found');
} }
} }
data['server_version'] = packageJson.version;
data['key_query_part'] = data['key_query_part'] =
req.query.key ? 'key=' + req.query.key + '&' : ''; req.query.key ? 'key=' + req.query.key + '&' : '';
data['key_query'] = req.query.key ? '?key=' + req.query.key : ''; data['key_query'] = req.query.key ? '?key=' + req.query.key : '';