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

added mozlog and file exists route

Browse source
This commit is contained in:
Abhinav Adduri 2017-06-08 13:45:28 -07:00
parent f9c2eb1ae4
commit 900fe32460
9 changed files with 127 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

19
server/portal_server.js
View file

@ -16,6 +16,10 @@ let notLocalHost =
conf.s3_bucket !== 'localhost' &&
conf.bitly_key !== 'localhost';
const mozlog = require('./log.js');
let log = mozlog('portal.server');
const app = express();
app.engine('handlebars', exphbs({ defaultLayout: 'main' }));
@ -30,6 +34,13 @@ app.get('/', (req, res) => {
res.render('index');
});
app.get('/exists/:id', (req, res) => {
let id = req.params.id;
storage.exists(id).then(doesExist => {
res.sendStatus(doesExist ? 200 : 404);
})
});
app.get('/download/:id', (req, res) => {
let id = req.params.id;
storage.filename(id).then(filename => {
@ -70,7 +81,7 @@ app.get('/assets/download/:id', (req, res) => {
file_stream.on(notLocalHost ? 'finish' : 'close', () => {
storage.forceDelete(id).then(err => {
if (!err) {
console.log('Deleted.');
log.info('Deleted:', id);
}
});
});
@ -100,7 +111,7 @@ app.post('/delete/:id', (req, res) => {
.delete(id, delete_token)
.then(err => {
if (!err) {
console.log('Deleted.');
log.info('Deleted:', id);
}
})
.catch(err => res.sendStatus(404));
@ -114,7 +125,7 @@ app.post('/upload/:id', (req, res, next) => {
req.pipe(req.busboy);
req.busboy.on('file', (fieldname, file, filename) => {
console.log('Uploading: ' + filename);
log.info('Uploading:', req.params.id);
let url = `${req.protocol}://${req.get('host')}/download/${req.params.id}/`;
storage.set(req.params.id, file, filename, url).then(linkAndID => {
@ -124,7 +135,7 @@ app.post('/upload/:id', (req, res, next) => {
});
let server = app.listen(conf.listen_port, () => {
console.log(`Portal app listening on port ${conf.listen_port}!`);
log.info('startServer:', `Portal app listening on port ${conf.listen_port}!`);
});
let validateID = route_id => {