16mm
/
intval3
1
0
Fork 0
Code Issues 1 Pull Requests 9 Projects Releases Wiki Activity

Push dev work to master #2

Merged
sixteenmillimeter merged 416 commits from dev into master 2018-07-19 15:29:02 +00:00
Conversation 0 Commits 416 Files Changed 85 +7 -1
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit aa82973598 - Show all commits

8
index.js
View File

@ -345,8 +345,13 @@ function rSequence (req, res, next) {
} }
function rUpdate (req, res, next) { function rUpdate (req, res, next) {
log.info(`update`, { time : +new Date() })
exec('sh ./scripts/update.sh', (err, stdio, stderr) => { exec('sh ./scripts/update.sh', (err, stdio, stderr) => {
res.send({ success : true, action : 'update' }) if (err) {
log.error(err)
}
log.info(`update`, { git : stdio })
res.send({ success : true, action : 'update', output : stdio })
res.end() res.end()
next() next()
setTimeout(() => { setTimeout(() => {
@ -356,6 +361,7 @@ function rUpdate (req, res, next) {
} }
function rRestart (req, res, next) { function rRestart (req, res, next) {
log.info(`restart`, { time : +new Date() })
res.send({ success : true, action : 'restart' }) res.send({ success : true, action : 'restart' })
res.end() res.end()
next() next()