diff options
author | Stefan <mu.stefan@googlemail.com> | 2015-04-11 00:13:04 +0200 |
---|---|---|
committer | Stefan <mu.stefan@googlemail.com> | 2015-04-11 00:13:04 +0200 |
commit | db5bdc87194cc8a790dd9d7cd656b72d42c5f285 (patch) | |
tree | 6ce9df76bf6c4a38b8bbbe6bb1db029a71896008 /src/node/hooks | |
parent | 8e4c961207bb995a61c94407c11efb298e5f3157 (diff) | |
download | etherpad-lite-db5bdc87194cc8a790dd9d7cd656b72d42c5f285.zip |
Log version number and git-sha on server start
Diffstat (limited to 'src/node/hooks')
-rw-r--r-- | src/node/hooks/express.js | 2 | ||||
-rw-r--r-- | src/node/hooks/express/adminplugins.js | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/node/hooks/express.js b/src/node/hooks/express.js index 3275bd3f..bf849419 100644 --- a/src/node/hooks/express.js +++ b/src/node/hooks/express.js @@ -13,6 +13,8 @@ exports.createServer = function () { console.log("Report bugs at https://github.com/ether/etherpad-lite/issues") serverName = "Etherpad " + settings.getGitCommit() + " (http://etherpad.org)"; + + console.log("Your Etherpad version is " + settings.getEpVersion() + " (" + settings.getGitCommit() + ")"); exports.restartServer(); diff --git a/src/node/hooks/express/adminplugins.js b/src/node/hooks/express/adminplugins.js index c49d6621..1ae8d7b5 100644 --- a/src/node/hooks/express/adminplugins.js +++ b/src/node/hooks/express/adminplugins.js @@ -4,7 +4,6 @@ var installer = require('ep_etherpad-lite/static/js/pluginfw/installer'); var plugins = require('ep_etherpad-lite/static/js/pluginfw/plugins'); var _ = require('underscore'); var semver = require('semver'); -var epVersion = require('ep_etherpad-lite/package.json').version; exports.expressCreateServer = function (hook_name, args, cb) { args.app.get('/admin/plugins', function(req, res) { @@ -18,6 +17,7 @@ exports.expressCreateServer = function (hook_name, args, cb) { }); args.app.get('/admin/plugins/info', function(req, res) { var gitCommit = settings.getGitCommit(); + var epVersion = settings.getEpVersion(); res.send( eejs.require("ep_etherpad-lite/templates/admin/plugins-info.html", { gitCommit: gitCommit, |