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

Merge branch '2.2' into 2.3

Browse Source
This commit is contained in:
Markus Mäkelä
2019-02-08 10:23:47 +02:00
parent b560a67e54 1be845c438
commit 946ffbb40d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
maxctrl/lib/common.js
View File

@ -316,7 +316,7 @@ module.exports = function() {
base = 'https://' base = 'https://'
} }
return base + argv.u + ':' + argv.p + '@' + host + '/v1/' + endpoint return base + host + '/v1/' + endpoint
} }
@ -358,6 +358,7 @@ module.exports = function() {
this.doAsyncRequest = function(host, resource, cb, obj) { this.doAsyncRequest = function(host, resource, cb, obj) {
args = obj || {} args = obj || {}
args.uri = getUri(host, this.argv.secure, resource) args.uri = getUri(host, this.argv.secure, resource)
args.auth = {user: argv.u, pass: argv.p}
args.json = true args.json = true
args.timeout = this.argv.timeout args.timeout = this.argv.timeout
setTlsCerts(args) setTlsCerts(args)