hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MXS-1300: Make output optional

Browse Source 
Minor refactoring to the core library to allow multiple calls from within
the same program.

Added --quiet option to silence output so that tests aren't so
verbose. Currently this only works on UNIX based systems.
This commit is contained in:
Markus Mäkelä
2017-07-14 16:36:59 +03:00
parent ec5b0fea39
commit d938dcc701
18 changed files with 116 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
maxctrl/common.js
View File

@ -14,19 +14,27 @@
var request = require('request-promise-native');
var colors = require('colors/safe');
var Table = require('cli-table');
var consoleLib = require('console')
var fs = require('fs')
module.exports = function() {
this._ = require('lodash-getpath')
this.logger = console
this.maxctrl = function(argv) {
if (argv.quiet) {
this.logger = new consoleLib.Console(fs.createWriteStream('/dev/null'), process.stderr)
}
this.argv = argv
return this
}
// Request a resource collection and format it as a table
this.getCollection = function (resource, fields) {
doRequest(resource, function(res) {
var header = []
@ -52,7 +60,7 @@ module.exports = function() {
table.push(row)
})
console.log(table.toString())
logger.log(table.toString())
})
}
@ -86,7 +94,7 @@ module.exports = function() {
table.push(row)
})
console.log(table.toString())
logger.log(table.toString())
})
}
@ -112,7 +120,7 @@ module.exports = function() {
table.push(o)
})
console.log(table.toString())
logger.log(table.toString())
})
}
@ -147,17 +155,24 @@ module.exports = function() {
.then(function(res) {
if (res && cb) {
// Request OK, returns data
if (!this.argv.tsv) {
console.log(colors.yellow(host) + ':')
if (!this.argv.tsv && this.argv.hosts.length > 1) {
logger.log(colors.yellow(host) + ':')
}
return cb(res)
} else {
// Request OK, no data or data is ignored
console.log(colors.yellow(host) + ': ' + colors.green('OK'))
if (this.argv.hosts.length > 1) {
logger.log(colors.yellow(host) + ': ' + colors.green('OK'))
} else {
logger.log(colors.green('OK'))
}
return Promise.resolve()
}
return Promise.resolve()
}, function(err) {
console.log(colors.yellow(host) + ':')
if (this.argv.hosts.length > 1) {
logger.log(colors.yellow(host) + ':')
}
if (err.response.body) {
logError(JSON.stringify(err.response.body, null, 4))
} else {
@ -193,11 +208,11 @@ module.exports = function() {
}
this.logError = function(err) {
console.log(colors.red('Error:'), err)
this.logger.error(colors.red('Error:'), err)
}
this.error = function(err) {
console.log(colors.red('Error:'), err)
logger.log(colors.red('Error:'), err)
this.argv.reject()
}
}