X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=skyquake%2Fplugins%2Fcomposer%2Fapi%2FpackageFileHandler.js;h=b38abdecc8283f03343788a2dc19b573f9e6056f;hb=24d53a7c630f61e02ee1bea3befc04ff4adb45e9;hp=f199610a758fbf57c9acd46786e0237463a6cefa;hpb=4e7b00465d087292dc6127bc892a5fa3a64365b6;p=osm%2FUI.git diff --git a/skyquake/plugins/composer/api/packageFileHandler.js b/skyquake/plugins/composer/api/packageFileHandler.js index f199610a7..b38abdecc 100644 --- a/skyquake/plugins/composer/api/packageFileHandler.js +++ b/skyquake/plugins/composer/api/packageFileHandler.js @@ -6,7 +6,7 @@ var constants = require('../../../framework/core/api_utils/constants.js'); var fs = require('fs'); var _ = require('lodash'); -PackageFileHandler = {}; +var PackageFileHandler = {}; function deleteFile(filename) { setTimeout(function() { @@ -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') + 'Authorization': req.session && req.session.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;