mentos1386/send
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:mozilla/something-awesome

Browse source
This commit is contained in:
Abhinav Adduri 2017-06-08 13:48:51 -07:00
commit f870ab1ab8
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
server/portal_server.js
View file

@ -84,9 +84,9 @@ app.get('/assets/download/:id', (req, res) => {
log.info('Deleted:', id); log.info('Deleted:', id);
} }
}); });
});
file_stream.pipe(res); file_stream.pipe(res);
});
}) })
.catch(err => { .catch(err => {
res.sendStatus(404); res.sendStatus(404);
@ -126,7 +126,9 @@ app.post('/upload/:id', (req, res, next) => {
req.pipe(req.busboy); req.pipe(req.busboy);
req.busboy.on('file', (fieldname, file, filename) => { req.busboy.on('file', (fieldname, file, filename) => {
log.info('Uploading:', req.params.id); log.info('Uploading:', req.params.id);
let url = `${req.protocol}://${req.get('host')}/download/${req.params.id}/`;
const protocol = conf.env === 'development' ? req.protocol : 'https';
let url = `${protocol}://${req.get('host')}/download/${req.params.id}/`;
storage.set(req.params.id, file, filename, url).then(linkAndID => { storage.set(req.params.id, file, filename, url).then(linkAndID => {
res.json(linkAndID); res.json(linkAndID);

4
server/storage.js
View file

@ -18,7 +18,9 @@ const mozlog = require('./log.js');
let log = mozlog('portal.storage'); let log = mozlog('portal.storage');
const redis = require('redis'); const redis = require('redis');
const redis_client = redis.createClient(); const redis_client = redis.createClient({
host: conf.redis_host
});
redis_client.on('error', err => { redis_client.on('error', err => {