Merge pull request #297 from mozilla/expire
added environment variable for expire time
This commit is contained in:
commit
ade214c69c
@ -1,4 +1,4 @@
|
|||||||
/* global MAXFILESIZE */
|
/* global MAXFILESIZE EXPIRE_SECONDS */
|
||||||
require('./common');
|
require('./common');
|
||||||
const FileSender = require('./fileSender');
|
const FileSender = require('./fileSender');
|
||||||
const {
|
const {
|
||||||
@ -256,7 +256,7 @@ $(document).ready(function() {
|
|||||||
const totalTime = endTime - startTime;
|
const totalTime = endTime - startTime;
|
||||||
const uploadTime = endTime - uploadStart;
|
const uploadTime = endTime - uploadStart;
|
||||||
const uploadSpeed = file.size / (uploadTime / 1000);
|
const uploadSpeed = file.size / (uploadTime / 1000);
|
||||||
const expiration = 24 * 60 * 60 * 1000; //will eventually come from a field
|
const expiration = EXPIRE_SECONDS * 1000;
|
||||||
|
|
||||||
// record upload-stopped (completed) by sender
|
// record upload-stopped (completed) by sender
|
||||||
sendEvent('sender', 'upload-stopped', {
|
sendEvent('sender', 'upload-stopped', {
|
||||||
|
@ -41,6 +41,11 @@ const conf = convict({
|
|||||||
format: Number,
|
format: Number,
|
||||||
default: 1024 * 1024 * 1024 * 2,
|
default: 1024 * 1024 * 1024 * 2,
|
||||||
env: 'P2P_MAX_FILE_SIZE'
|
env: 'P2P_MAX_FILE_SIZE'
|
||||||
|
},
|
||||||
|
expire_seconds: {
|
||||||
|
format: Number,
|
||||||
|
default: 86400,
|
||||||
|
env: 'EXPIRE_SECONDS'
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -86,6 +86,7 @@ app.get('/jsconfig.js', (req, res) => {
|
|||||||
trackerId: conf.analytics_id,
|
trackerId: conf.analytics_id,
|
||||||
dsn: conf.sentry_id,
|
dsn: conf.sentry_id,
|
||||||
maxFileSize: conf.max_file_size,
|
maxFileSize: conf.max_file_size,
|
||||||
|
expireSeconds: conf.expire_seconds,
|
||||||
layout: false
|
layout: false
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
@ -152,7 +152,7 @@ function localSet(newId, file, filename, meta) {
|
|||||||
});
|
});
|
||||||
fstream.on('finish', () => {
|
fstream.on('finish', () => {
|
||||||
redis_client.hmset(newId, meta);
|
redis_client.hmset(newId, meta);
|
||||||
redis_client.expire(newId, 86400000);
|
redis_client.expire(newId, conf.expire_seconds);
|
||||||
log.info('localSet:', 'Upload Finished of ' + newId);
|
log.info('localSet:', 'Upload Finished of ' + newId);
|
||||||
resolve(meta.delete);
|
resolve(meta.delete);
|
||||||
});
|
});
|
||||||
@ -238,7 +238,7 @@ function awsSet(newId, file, filename, meta) {
|
|||||||
return upload.promise().then(
|
return upload.promise().then(
|
||||||
() => {
|
() => {
|
||||||
redis_client.hmset(newId, meta);
|
redis_client.hmset(newId, meta);
|
||||||
redis_client.expire(newId, 86400000);
|
redis_client.expire(newId, conf.expire_seconds);
|
||||||
log.info('awsUploadFinish', 'Upload Finished of ' + filename);
|
log.info('awsUploadFinish', 'Upload Finished of ' + filename);
|
||||||
},
|
},
|
||||||
err => {
|
err => {
|
||||||
|
@ -115,7 +115,7 @@ describe('Testing Set using aws', function() {
|
|||||||
.set('123', {on: sinon.stub()}, 'Filename.moz', {})
|
.set('123', {on: sinon.stub()}, 'Filename.moz', {})
|
||||||
.then(() => {
|
.then(() => {
|
||||||
assert(expire.calledOnce);
|
assert(expire.calledOnce);
|
||||||
assert(expire.calledWith('123', 86400000));
|
assert(expire.calledWith('123', 86400));
|
||||||
})
|
})
|
||||||
.catch(err => assert.fail());
|
.catch(err => assert.fail());
|
||||||
});
|
});
|
||||||
|
@ -5,3 +5,4 @@ window.dsn = '{{{dsn}}}';
|
|||||||
window.trackerId = '{{{trackerId}}}';
|
window.trackerId = '{{{trackerId}}}';
|
||||||
{{/if}}
|
{{/if}}
|
||||||
const MAXFILESIZE = {{{maxFileSize}}};
|
const MAXFILESIZE = {{{maxFileSize}}};
|
||||||
|
const EXPIRE_SECONDS = {{{expireSeconds}}};
|
||||||
|
Loading…
Reference in New Issue
Block a user