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 +3 -2
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c5c1f649a3 - Show all commits

5
index.js
View File

@ -248,6 +248,7 @@ function rStatus (req, res, next) {
} }
function rReset (req, res, next) { function rReset (req, res, next) {
log.info'/reset', {time : +new Date()})
intval.reset() intval.reset()
setTimeout(() => { setTimeout(() => {
res.send(intval._state) res.send(intval._state)
@ -345,7 +346,7 @@ function rSequence (req, res, next) {
} }
function rUpdate (req, res, next) { function rUpdate (req, res, next) {
log.info(`update`, { time : +new Date() }) log.info(`/update`, { time : +new Date() })
exec('sh ./scripts/update.sh', (err, stdio, stderr) => { exec('sh ./scripts/update.sh', (err, stdio, stderr) => {
if (err) { if (err) {
log.error(err) log.error(err)
@ -361,7 +362,7 @@ function rUpdate (req, res, next) {
} }
function rRestart (req, res, next) { function rRestart (req, res, next) {
log.info(`restart`, { time : +new Date() }) log.info(`/restart`, { time : +new Date() })
res.send({ success : true, action : 'restart' }) res.send({ success : true, action : 'restart' })
res.end() res.end()
next() next()