dylan.derr/Send
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into on-redis-expire

Browse source
This commit is contained in:
Danny Coates 2018-01-31 13:10:05 -08:00 • committed by GitHub
commit af3848586c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
113 changed files with 4178 additions and 1427 deletions
Download patch file Download diff file Expand all files Collapse all files

10
server/storage.js
View file

@ -148,7 +148,7 @@ function localSet(newId, file, meta) {
redis_client.hmset(newId, meta);
redis_client.expire(newId, config.expire_seconds);
log.info('localSet:', 'Upload Finished of ' + newId);
resolve(meta.delete);
resolve(meta.owner);
});
fstream.on('error', err => {
@ -159,10 +159,10 @@ function localSet(newId, file, meta) {
});
}
function localDelete(id, delete_token) {
function localDelete(id, ownerToken) {
return new Promise((resolve, reject) => {
redis_client.hget(id, 'delete', (err, reply) => {
if (!reply || delete_token !== reply) {
if (!reply || ownerToken !== reply) {
reject();
} else {
redis_client.del(id);
@ -244,10 +244,10 @@ function awsSet(newId, file, meta) {
);
}
function awsDelete(id, delete_token) {
function awsDelete(id, ownerToken) {
return new Promise((resolve, reject) => {
redis_client.hget(id, 'delete', (err, reply) => {
if (!reply || delete_token !== reply) {
if (!reply || ownerToken !== reply) {
reject();
} else {
const params = {