Push dev work to master #2

Merged
sixteenmillimeter merged 416 commits from dev into master 2018-07-19 15:29:02 +00:00
1 changed files with 3 additions and 3 deletions
Showing only changes of commit 2c40fa4e0e - Show all commits

View File

@ -40,8 +40,8 @@ function createServer () {
app.get( '/status', rStatus) app.get( '/status', rStatus)
app.post('/reset', rReset) app.post('/reset', rReset)
app.get('/update', rUpdate) app.post('/update', rUpdate)
app.get('/restart', rRestart) app.post('/restart', rRestart)
app.listen(PORT, () => { app.listen(PORT, () => {
@ -351,7 +351,7 @@ function rUpdate (req, res, next) {
if (err) { if (err) {
log.error(err) log.error(err)
} }
log.info(`update`, { git : stdio }) log.info(`/update`, { git : stdio })
res.send({ success : true, action : 'update', output : stdio }) res.send({ success : true, action : 'update', output : stdio })
res.end() res.end()
next() next()