projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Config Parameter Map enhancements
[osm/UI.git]
/
skyquake
/
plugins
/
composer
/
api
/
composer.js
diff --git
a/skyquake/plugins/composer/api/composer.js
b/skyquake/plugins/composer/api/composer.js
index
a2355ab
..
23345f5
100644
(file)
--- a/
skyquake/plugins/composer/api/composer.js
+++ b/
skyquake/plugins/composer/api/composer.js
@@
-312,7
+312,7
@@
Composer.update = function(req) {
var download_host = req.query['dev_download_server'];
if (!download_host) {
var download_host = req.query['dev_download_server'];
if (!download_host) {
- download_host =
req.protocol + '://' + req.headers.host
;
+ download_host =
api_server + ':' + utils.getPortForProtocol(req.protocol)
;
}
var input = {
'external-url': download_host + '/composer/update/' + req.file.filename,
}
var input = {
'external-url': download_host + '/composer/update/' + req.file.filename,
@@
-368,7
+368,7
@@
Composer.upload = function(req) {
var download_host = req.query['dev_download_server'];
if (!download_host) {
var download_host = req.query['dev_download_server'];
if (!download_host) {
- download_host =
req.protocol + '://' + req.headers.host
;
+ download_host =
api_server + ':' + utils.getPortForProtocol(req.protocol)
;
}
return new Promise(function(resolve, reject) {
}
return new Promise(function(resolve, reject) {
@@
-425,7
+425,7
@@
Composer.addFile = function(req) {
var package_type = req.query['package_type'].toUpperCase();
var package_path = req.query['package_path'];
if (!download_host) {
var package_type = req.query['package_type'].toUpperCase();
var package_path = req.query['package_path'];
if (!download_host) {
- download_host =
req.protocol + '://' + req.headers.host
;
+ download_host =
api_server + ':' + utils.getPortForProtocol(req.protocol)
;
}
return new Promise(function(resolve, reject) {
}
return new Promise(function(resolve, reject) {
@@
-612,6
+612,9
@@
FileManager.get = function(req) {
data: data.body
});
}
data: data.body
});
}
+ }).catch(function(err) {
+ console.log('Failed to retrieve FileManager.list')
+ resolve(err);
})
}
})
})
}
})
@@
-633,7
+636,7
@@
FileManager.job = function(req) {
forever: constants.FOREVER_ON,
rejectUnauthorized: false,
}, function(error, response, body) {
forever: constants.FOREVER_ON,
rejectUnauthorized: false,
}, function(error, response, body) {
- if (utils.validateResponse('
restconfAPI.streams
', error, response, body, resolve, reject)) {
+ if (utils.validateResponse('
FileManager.job
', error, response, body, resolve, reject)) {
var data = JSON.parse(response.body)['rw-pkg-mgmt:download-jobs'];
var returnData = [];
data && data.job.map(function(d) {
var data = JSON.parse(response.body)['rw-pkg-mgmt:download-jobs'];
var returnData = [];
data && data.job.map(function(d) {