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

MXS-1300: Take the refactored core into use

Browse Source 
The refactored maxctrl function is now in use.
This commit is contained in:
Markus Mäkelä
2017-07-15 06:59:49 +03:00
parent b98b326bba
commit 3255d58e70
18 changed files with 178 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
maxctrl/common.js
View File

@ -52,7 +52,7 @@ module.exports = function() {
// Request a resource collection and format it as a table
this.getCollection = function (host, resource, fields) {
doRequest(host, resource, function(res) {
return doRequest(host, resource, function(res) {
var header = []
@ -84,8 +84,7 @@ module.exports = function() {
// Request a part of a resource as a collection
this.getSubCollection = function (host, resource, subres, fields) {
doRequest(host, resource, function(res) {
return doRequest(host, resource, function(res) {
var header = []
fields.forEach(function(i) {
@ -118,7 +117,7 @@ module.exports = function() {
// Request a single resource and format it as a key-value list
this.getResource = function (host, resource, fields) {
doRequest(resource, function(res) {
return doRequest(host, resource, function(res) {
var table = getList()
fields.forEach(function(i) {
@ -141,6 +140,12 @@ module.exports = function() {
})
}
this.updateValue = function(host, resource, key, value) {
var body = {}
_.set(body, key, value)
return doRequest(host, resource, null, { method: 'PATCH', body: body })
}
// Helper for converting endpoints to acutal URLs
this.getUri = function(host, secure, endpoint) {
var base = 'http://'
@ -172,10 +177,12 @@ module.exports = function() {
return Promise.resolve()
}
}, function(err) {
if (err.response.body) {
if (err.response && err.response.body) {
logError(JSON.stringify(err.response.body, null, 4))
} else {
} else if (err.statusCode) {
logError('Server responded with ' + err.statusCode)
} else {
logError('Undefined error: ' + JSON.stringify(err, null, 4))
}
return Promise.reject()
})
@ -186,12 +193,6 @@ module.exports = function() {
.then(this.argv.resolve, this.argv.reject)
}
this.updateValue = function(host, resource, key, value) {
var body = {}
_.set(body, key, value)
doRequest(host, resource, null, { method: 'PATCH', body: body })
}
this.logError = function(err) {
this.logger.error(colors.red('Error:'), err)
}