show last commit hash alongside server version in footer

This commit is contained in:
Rigel Kent 2018-09-29 19:53:49 +02:00 committed by Chocobozzz
parent 26b4151762
commit abb2c7927c
6 changed files with 27 additions and 12 deletions

View file

@ -10,6 +10,7 @@ import { customConfigUpdateValidator } from '../../middlewares/validators/config
import { ClientHtml } from '../../lib/client-html'
import { auditLoggerFactory, CustomConfigAuditView, getAuditIdFromRes } from '../../helpers/audit-logger'
import { remove, writeJSON } from 'fs-extra'
import { version } from '../../tools/cli'
const packageJSON = require('../../../../package.json')
const configRouter = express.Router()
@ -38,9 +39,12 @@ configRouter.delete('/custom',
asyncMiddleware(deleteCustomConfig)
)
let serverCommit: string
async function getConfig (req: express.Request, res: express.Response, next: express.NextFunction) {
const allowed = await isSignupAllowed()
const allowedForCurrentIP = isSignupAllowedForCurrentIP(req.ip)
serverCommit = (serverCommit) ? serverCommit : version()
if (serverCommit === packageJSON.version) serverCommit = ''
const enabledResolutions = Object.keys(CONFIG.TRANSCODING.RESOLUTIONS)
.filter(key => CONFIG.TRANSCODING.ENABLED === CONFIG.TRANSCODING.RESOLUTIONS[key] === true)
@ -58,6 +62,7 @@ async function getConfig (req: express.Request, res: express.Response, next: exp
}
},
serverVersion: packageJSON.version,
serverCommit,
signup: {
allowed,
allowedForCurrentIP,