Compare commits
1 Commits
developmen
...
user/benoi
Author | SHA1 | Date |
---|---|---|
Benoit A | faab893472 |
|
@ -3,6 +3,7 @@ const http = require('http');
|
|||
const url = require('url');
|
||||
const AWS = require('aws-sdk');
|
||||
const Sproxy = require('sproxydclient');
|
||||
const Hyperdrive = require('hdclient');
|
||||
const HttpsProxyAgent = require('https-proxy-agent');
|
||||
|
||||
const constants = require('../../constants');
|
||||
|
@ -25,21 +26,26 @@ function parseLC(config, vault) {
|
|||
if (locationObj.type === 'file') {
|
||||
clients[location] = new DataFileBackend(config);
|
||||
}
|
||||
if (locationObj.type === 'scality'
|
||||
&& locationObj.details.connector.sproxyd) {
|
||||
clients[location] = new Sproxy({
|
||||
bootstrap: locationObj.details.connector
|
||||
if (locationObj.type === 'scality') {
|
||||
if (locationObj.details.connector.sproxyd) {
|
||||
clients[location] = new Sproxy({
|
||||
bootstrap: locationObj.details.connector
|
||||
.sproxyd.bootstrap,
|
||||
// Might be undefined which is ok since there is a default
|
||||
// set in sproxydclient if chordCos is undefined
|
||||
chordCos: locationObj.details.connector.sproxyd.chordCos,
|
||||
// Might also be undefined, but there is a default path set
|
||||
// in sproxydclient as well
|
||||
path: locationObj.details.connector.sproxyd.path,
|
||||
// enable immutable optim for all objects
|
||||
immutable: true,
|
||||
});
|
||||
clients[location].clientType = 'scality';
|
||||
// Might be undefined which is ok since there is a default
|
||||
// set in sproxydclient if chordCos is undefined
|
||||
chordCos: locationObj.details.connector.sproxyd.chordCos,
|
||||
// Might also be undefined, but there is a default path set
|
||||
// in sproxydclient as well
|
||||
path: locationObj.details.connector.sproxyd.path,
|
||||
// enable immutable optim for all objects
|
||||
immutable: true,
|
||||
});
|
||||
clients[location].clientType = 'scality';
|
||||
} else if (locationObj.details.connector.hdclient) {
|
||||
clients[location] = new Hyperdrive.hdcontroller.HDProxydClient(
|
||||
locationObj.details.connector.hdclient);
|
||||
clients[location].clientType = 'scality';
|
||||
}
|
||||
}
|
||||
if (locationObj.type === 'aws_s3' || locationObj.type === 'gcp') {
|
||||
let connectionAgent;
|
||||
|
|
|
@ -1436,6 +1436,22 @@
|
|||
"safe-buffer": "^5.0.1"
|
||||
}
|
||||
},
|
||||
"hdclient": {
|
||||
"version": "github:scality/hdclient#5145e04e5ed33e85106765b1caa90cd245ef482b",
|
||||
"from": "github:scality/hdclient#5145e04e5ed33e85106765b1caa90cd245ef482b",
|
||||
"requires": {
|
||||
"werelogs": "github:scality/werelogs#GA7.2.0.5"
|
||||
},
|
||||
"dependencies": {
|
||||
"werelogs": {
|
||||
"version": "github:scality/werelogs#bc034589ebf7810d6e6d61932f94327976de6eef",
|
||||
"from": "github:scality/werelogs#GA7.2.0.5",
|
||||
"requires": {
|
||||
"safe-json-stringify": "^1.0.3"
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
"he": {
|
||||
"version": "1.1.1",
|
||||
"resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz",
|
||||
|
@ -2830,10 +2846,13 @@
|
|||
"sproxydclient": {
|
||||
"version": "github:scality/sproxydclient#45090b76b24ca1d05482bf151ba84ff6178423d1",
|
||||
"from": "github:scality/sproxydclient#45090b7",
|
||||
"requires": {
|
||||
"werelogs": "github:scality/werelogs#7.4.0.3"
|
||||
},
|
||||
"dependencies": {
|
||||
"werelogs": {
|
||||
"version": "github:scality/werelogs#a5605431dfd5927fe74871a737b14fcdbbe9b0c2",
|
||||
"from": "github:scality/werelogs#a5605431dfd5927fe74871a737b14fcdbbe9b0c2",
|
||||
"from": "github:scality/werelogs#7.4.0.3",
|
||||
"requires": {
|
||||
"safe-json-stringify": "^1.0.3"
|
||||
}
|
||||
|
|
|
@ -27,6 +27,7 @@
|
|||
"debug": "~4.1.0",
|
||||
"diskusage": "^1.0.0",
|
||||
"fcntl": "github:scality/node-fcntl",
|
||||
"hdclient": "scality/hdclient#5145e04e5ed33e85106765b1caa90cd245ef482b",
|
||||
"https-proxy-agent": "^2.2.0",
|
||||
"ioredis": "4.2.0",
|
||||
"ipaddr.js": "1.8.1",
|
||||
|
|
Loading…
Reference in New Issue