Merge branch 'master' of github.com:mozilla/send into localization
This commit is contained in:
commit
902010704a
33 changed files with 246 additions and 869 deletions
|
@ -224,6 +224,19 @@ app.post('/upload', (req, res, next) => {
|
|||
});
|
||||
});
|
||||
});
|
||||
|
||||
req.on('close', err => {
|
||||
storage
|
||||
.forceDelete(newId)
|
||||
.then(err => {
|
||||
if (!err) {
|
||||
log.info('Deleted:', newId);
|
||||
}
|
||||
})
|
||||
.catch(err => {
|
||||
log.info('DeleteError:', newId);
|
||||
});
|
||||
})
|
||||
});
|
||||
|
||||
app.get('/__lbheartbeat__', (req, res) => {
|
||||
|
|
|
@ -234,13 +234,13 @@ function awsDelete(id, delete_token) {
|
|||
if (!reply || delete_token !== reply) {
|
||||
reject();
|
||||
} else {
|
||||
redis_client.del(id);
|
||||
const params = {
|
||||
Bucket: conf.s3_bucket,
|
||||
Key: id
|
||||
};
|
||||
|
||||
s3.deleteObject(params, function(err, _data) {
|
||||
redis_client.del(id);
|
||||
err ? reject(err) : resolve(err);
|
||||
});
|
||||
}
|
||||
|
@ -250,13 +250,13 @@ function awsDelete(id, delete_token) {
|
|||
|
||||
function awsForceDelete(id) {
|
||||
return new Promise((resolve, reject) => {
|
||||
redis_client.del(id);
|
||||
const params = {
|
||||
Bucket: conf.s3_bucket,
|
||||
Key: id
|
||||
};
|
||||
|
||||
s3.deleteObject(params, function(err, _data) {
|
||||
redis_client.del(id);
|
||||
err ? reject(err) : resolve(err);
|
||||
});
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue