github-mirrors/kibana
1
0
Fork 0
mirror of https://github.com/elastic/kibana.git synced 2025-04-23 17:28:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

revert move from request to wreck in plugin installer

Browse source
This commit is contained in:
spalger 2015-08-14 15:28:14 -07:00
parent cbc2df78fb
commit 44bd60e48f
2 changed files with 13 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
package.json
View file

@ -106,6 +106,7 @@
"numeral": "^1.5.3",
"nvd3": "panda01/nvd3#kibana",
"raw-loader": "^0.5.1",
"request": "^2.60.0",
"requirefrom": "^0.2.0",
"rimraf": "^2.4.1",
"rjs-repack-loader": "^1.0.6",
@ -117,7 +118,6 @@
"webpack": "^1.10.0",
"webpack-directory-name-as-main": "^1.0.0",
"whatwg-fetch": "^0.9.0",
"wreck": "^6.1.0",
"zeroclipboard": "^2.2.0"
},
"devDependencies": {
@ -155,7 +155,8 @@
"portscanner": "^1.0.0",
"simple-git": "^1.3.0",
"sinon": "^1.15.4",
"source-map": "^0.4.4"
"source-map": "^0.4.4",
"wreck": "^6.1.0"
},
"engines": {
"node": ">=2"

25
src/cli/plugin/pluginDownloader.js
View file

@ -1,7 +1,7 @@
var _ = require('lodash');
var zlib = require('zlib');
var Promise = require('bluebird');
var wreck = require('wreck');
var request = require('request');
var tar = require('tar');
var progressReporter = require('./progressReporter');
@ -48,7 +48,12 @@ module.exports = function (settings, logger) {
var gunzip = zlib.createGunzip();
var tarExtract = new tar.Extract({ path: dest, strip: 1 });
return wrappedRequest(source, timeout)
var requestOptions = { url: source };
if (timeout !== 0) {
requestOptions.timeout = timeout;
}
return wrappedRequest(requestOptions)
.then(function (req) {
var reporter = progressReporter(logger, req);
@ -66,19 +71,9 @@ module.exports = function (settings, logger) {
});
}
function wrappedRequest(url, timeout) {
if (timeout) timeout = false;
return Promise.fromNode(cb => {
let request = wreck
.defaults({ timeout })
.request('GET', url, null, (err, response) => {
if (err || !response) cb(err);
response.request = request;
response.abort = () => request.abort();
cb(null, response);
});
function wrappedRequest(requestOptions) {
return Promise.try(function () {
return request.get(requestOptions);
})
.catch(function (err) {
if (err.message.match(/invalid uri/i)) {