Compare View
Commits (2)
Changes
Showing 2 changed files Side-by-side Diff
logger-circular-buffer-web.js
| ... | ... | @@ -6,31 +6,37 @@ const auth = require('basic-auth'); |
| 6 | 6 | const config = require('./config'); |
| 7 | 7 | const logger = require('./logger'); |
| 8 | 8 | |
| 9 | -if (config && config.logger && && config.logger.circular_buffer_http && config.logger.circular_buffer_http.listen_port) { | |
| 10 | - http.createServer(function(req, res) { | |
| 11 | - var credentials = auth(req); | |
| 12 | - | |
| 13 | - if (!credentials && credentials.name != config.logger.circular_buffer.username && credentials.pass != config.logger.circular_buffer.password) { | |
| 14 | - res.statusCode = 401; | |
| 15 | - res.setHeader('WWW-Authenticate', 'Basic realm="example"'); | |
| 16 | - res.end('Access denied'); | |
| 17 | - } | |
| 18 | - else { | |
| 19 | - | |
| 20 | - logger.query({json: true, order: desc}, function(err, results) { | |
| 21 | - if (err) { | |
| 22 | - res.end('INVALID LOGGER'); | |
| 23 | - } | |
| 24 | - else { | |
| 25 | - res.writeHead(200, { 'Content-Type': 'application/json' }); | |
| 26 | - res.end(JSON.stringify(results)); | |
| 27 | - } | |
| 28 | - }); | |
| 29 | - } | |
| 30 | - }).listen(config.logger.circular_buffer_http.listen_port); | |
| 31 | - | |
| 32 | - logger.verbose('Logger circular buffer http server listen on port ' + config.logger.circular_buffer_http.listen_port); | |
| 33 | -} | |
| 34 | -else { | |
| 35 | - logger.verbose('Circular buffer logger http reader server is not configured, please set config.logger.circular_buffer.listen_port, config.logger.circular_buffer.username, and config.logger.circular_buffer.password') | |
| 9 | +function listen(options) { | |
| 10 | + if (options && options.port && options.username && options.password) { | |
| 11 | + | |
| 12 | + http.createServer(function(req, res) { | |
| 13 | + var credentials = auth(req); | |
| 14 | + | |
| 15 | + if (!credentials && credentials.name != options.username && credentials.pass != options.password) { | |
| 16 | + res.statusCode = 401; | |
| 17 | + res.setHeader('WWW-Authenticate', 'Basic realm="example"'); | |
| 18 | + res.end('Access denied'); | |
| 19 | + } | |
| 20 | + else { | |
| 21 | + | |
| 22 | + logger.query({json: true, order: desc}, function(err, results) { | |
| 23 | + if (err) { | |
| 24 | + res.end('INVALID LOGGER'); | |
| 25 | + } | |
| 26 | + else { | |
| 27 | + res.writeHead(200, { 'Content-Type': 'application/json' }); | |
| 28 | + res.end(JSON.stringify(results)); | |
| 29 | + } | |
| 30 | + }); | |
| 31 | + } | |
| 32 | + }).listen(options.port); | |
| 33 | + | |
| 34 | + logger.verbose('Logger circular buffer http server listen on port ' + options.port); | |
| 35 | + } | |
| 36 | + else { | |
| 37 | + logger.verbose('Circular buffer logger http server viewer is not configured. Please set options.port, options.username, options.password'); | |
| 38 | + } | |
| 39 | + | |
| 36 | 40 | } |
| 41 | + | |
| 42 | +exports.listen = listen; |