mirror of
https://github.com/openstf/stf
synced 2025-10-04 02:09:32 +02:00
Start auth-mock with stf local
and make the log tag clearer.
This commit is contained in:
parent
2b46ff41d3
commit
e924b73394
3 changed files with 23 additions and 5 deletions
20
lib/cli.js
20
lib/cli.js
|
@ -262,9 +262,17 @@ program
|
|||
, 'device pull endpoint'
|
||||
, String
|
||||
, 'tcp://127.0.0.1:7116')
|
||||
.option('--auth-port <port>'
|
||||
, 'auth port'
|
||||
, Number
|
||||
, 7120)
|
||||
.option('--auth-secret <secret>'
|
||||
, 'auth secret'
|
||||
, String
|
||||
, 'kute kittykat')
|
||||
.action(function() {
|
||||
var log = logger.createLogger('cli')
|
||||
var options = cliutil.lastArg(arguments)
|
||||
, options = cliutil.lastArg(arguments)
|
||||
|
||||
// app triproxy
|
||||
procutil.fork(__filename, [
|
||||
|
@ -317,6 +325,16 @@ program
|
|||
.catch(function(err) {
|
||||
log.error('provider died', err.stack)
|
||||
})
|
||||
|
||||
// auth-mock
|
||||
procutil.fork(__filename, [
|
||||
'auth-mock'
|
||||
, '--port', options.authPort
|
||||
, '--secret', options.authSecret
|
||||
])
|
||||
.catch(function(err) {
|
||||
log.error('auth-mock died', err.stack)
|
||||
})
|
||||
})
|
||||
|
||||
program.parse(process.argv)
|
||||
|
|
|
@ -9,7 +9,7 @@ var ldaputil = require('../../util/ldaputil')
|
|||
var jwtutil = require('../../util/jwtutil')
|
||||
|
||||
module.exports = function(options) {
|
||||
var log = logger.createLogger('app')
|
||||
var log = logger.createLogger('auth-ldap')
|
||||
, app = express()
|
||||
|
||||
app.use(express.cookieParser())
|
||||
|
@ -26,7 +26,7 @@ module.exports = function(options) {
|
|||
})
|
||||
|
||||
app.post('/auth', function(req, res) {
|
||||
var log = logger.createLogger('auth')
|
||||
var log = logger.createLogger('auth-ldap')
|
||||
log.setLocalIdentifier(req.ip)
|
||||
switch (req.accepts(['json'])) {
|
||||
case 'json':
|
||||
|
|
|
@ -9,7 +9,7 @@ var jwtutil = require('../../util/jwtutil')
|
|||
var pathutil = require('../../util/pathutil')
|
||||
|
||||
module.exports = function(options) {
|
||||
var log = logger.createLogger('app')
|
||||
var log = logger.createLogger('auth-mock')
|
||||
, app = express()
|
||||
|
||||
app.set('view engine', 'jade')
|
||||
|
@ -52,7 +52,7 @@ module.exports = function(options) {
|
|||
})
|
||||
|
||||
app.post('/api/v1/auth', function(req, res) {
|
||||
var log = logger.createLogger('auth')
|
||||
var log = logger.createLogger('auth-mock')
|
||||
log.setLocalIdentifier(req.ip)
|
||||
switch (req.accepts(['json'])) {
|
||||
case 'json':
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue