X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=blobdiff_plain;f=skyquake%2Fplugins%2Fcomposer%2Fapi%2FpackageFileHandler.js;h=cc9cca7c3a5fc472f56751bb94dc5f76cc666670;hp=f199610a758fbf57c9acd46786e0237463a6cefa;hb=e4df686d0a75f68183f594363253f059d1ed3a2b;hpb=bf7fb7be119bdd14806000ca6ddf67e2ce3491f3 diff --git a/skyquake/plugins/composer/api/packageFileHandler.js b/skyquake/plugins/composer/api/packageFileHandler.js index f199610a7..cc9cca7c3 100644 --- a/skyquake/plugins/composer/api/packageFileHandler.js +++ b/skyquake/plugins/composer/api/packageFileHandler.js @@ -14,15 +14,16 @@ function deleteFile(filename) { }, constants.PACKAGE_FILE_DELETE_DELAY_MILLISECONDS); }; -function checkStatus(req, transactionId) { +function checkStatus(req, transactionId, isUpdate) { var upload_server = req.query['upload_server']; var headers = _.extend({}, { 'Authorization': req.get('Authorization') } ); + var type = isUpdate ? 'update' : 'upload'; request({ - url: upload_server + ':' + constants.PACKAGE_MANAGER_SERVER_PORT + '/api/upload/' + transactionId + '/state', + url: upload_server + ':' + constants.PACKAGE_MANAGER_SERVER_PORT + '/api/' + type + '/' + transactionId + '/state', type: 'GET', headers: headers, forever: constants.FOREVER_ON, @@ -44,16 +45,16 @@ function checkStatus(req, transactionId) { deleteFile(req.file.filename); } else { setTimeout(function() { - checkStatus(req, transactionId); + checkStatus(req, transactionId, isUpdate); }, constants.PACKAGE_FILE_ONBOARD_TRANSACTION_STATUS_CHECK_DELAY_MILLISECONDS); } } }); }; -PackageFileHandler.checkCreatePackageStatusAndHandleFile = function(req, transactionId) { - checkStatus(req, transactionId); +PackageFileHandler.checkCreatePackageStatusAndHandleFile = function(req, transactionId, isUpdate) { + checkStatus(req, transactionId, isUpdate); }; -module.exports = PackageFileHandler; \ No newline at end of file +module.exports = PackageFileHandler;