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 4 additions and 3 deletions
Showing only changes of commit 7f48045bbd - Show all commits

View File

@ -1,7 +1,7 @@
'use strict' 'use strict'
const restify = require('restify') const restify = require('restify')
const logger = require('winston') const log = require('./lib/log')('main')
const fs = require('fs') const fs = require('fs')
const ble = require('./lib/blootstrap') const ble = require('./lib/blootstrap')
@ -25,18 +25,19 @@ function createServer () {
app.post('/sequence', () => {}) app.post('/sequence', () => {})
app.get('/status', rStatus) app.get('/status', rStatus)
app.listen(PORT, () => { app.listen(PORT, () => {
console.log(`${APPNAME} listening on port ${PORT}!`) log.info('server', { name : APPNAME, port : PORT })
}) })
} }
function rFrame (req, res, next) { function rFrame (req, res, next) {
intval.frame()
res.send({}) res.send({})
return next() return next()
} }
function rStatus (req, res, next) { function rStatus (req, res, next) {
const obj = intval.status() const obj = intval.status()
res.send({}) res.send(obj)
return next() return next()
} }