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

MXS-1656: Rename misleading functions

Browse Source 
The function getResource had two different implementations that did very
different things. The newer version, that returns the raw JSON object that
represents a resource, was renamed to getJson.
This commit is contained in:
Markus Mäkelä 2018-02-16 08:54:23 +02:00
parent ee3612da42
commit f4af4fa038
No known key found for this signature in database
GPG Key ID: 72D48FCE664F7B19
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maxctrl/lib/common.js
View File

@ -94,7 +94,7 @@ module.exports = function() {
// Get a resource as raw collection; a matrix of strings
this.getRawCollection = function (host, resource, fields) {
return getResource(host, resource)
return getJson(host, resource)
.then((res) => filterResource(res, fields))
}
@ -268,7 +268,7 @@ module.exports = function() {
return doAsyncRequest(host, resource, cb, obj)
}
this.getResource = function(host, resource) {
this.getJson = function(host, resource) {
return doAsyncRequest(host, resource, (res) => {
return res
})

4
maxctrl/lib/list.js
View File

@ -33,7 +33,7 @@ exports.builder = function(yargs) {
]
// First, get the list of all servers
return getResource(host, 'servers')
return getJson(host, 'servers')
.then((res) => {
promises = []
@ -49,7 +49,7 @@ exports.builder = function(yargs) {
// This servers is monitored by a monitor, get the monitor resource
promises.push(
getResource(host, 'monitors/' + owner)
getJson(host, 'monitors/' + owner)
.then((res) => {
// Check if the monitor defines a server_info object