summaryrefslogtreecommitdiff
path: root/app/server
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2018-06-04 02:54:44 +0200
committerJules Laplace <julescarbon@gmail.com>2018-06-04 02:54:44 +0200
commit2f22fd5e4a558ed9b2379565be88b9d1e1b9b7c5 (patch)
tree4a66cae0cc816bf01949b3076fbb082a460d47cb /app/server
parent9871cd35c31e77fac9ed484f80783e3267573016 (diff)
instructing server to curl files into the database/s3
Diffstat (limited to 'app/server')
-rw-r--r--app/server/bridge.js2
-rw-r--r--app/server/proxy.js4
-rw-r--r--app/server/site.js10
3 files changed, 8 insertions, 8 deletions
diff --git a/app/server/bridge.js b/app/server/bridge.js
index 776ec31..bbe0e26 100644
--- a/app/server/bridge.js
+++ b/app/server/bridge.js
@@ -91,7 +91,7 @@ function bind_client(socket){
if (process.env.CACHE_SYSCALLS) {
const id = make_client_id(data)
console.log('client', id)
- console.log(id in syscall_lookup)
+ // console.log(id in syscall_lookup)
if (id in syscall_lookup) {
const cached = syscall_lookup[id]
syscall_lookup[id].uuid = data.uuid
diff --git a/app/server/proxy.js b/app/server/proxy.js
index 2dcc1d7..7526f01 100644
--- a/app/server/proxy.js
+++ b/app/server/proxy.js
@@ -69,14 +69,14 @@ function serve(req, res) {
}
if (DEBUG) {
- server_res.on('data', s => console.log(s.toString()))
+ // server_res.on('data', s => console.log(s.toString()))
}
server_res.resume()
})
connector.on('error', e => console.error(e))
if (DEBUG) {
- req.on('data', s => console.log('>>', s.toString()))
+ // req.on('data', s => console.log('>>', s.toString()))
}
req.on('error', s => { console.log('/!\\ ERROR /!\\'); console.log(s) })
req.pipe(connector)
diff --git a/app/server/site.js b/app/server/site.js
index 23e2cb1..aa7087c 100644
--- a/app/server/site.js
+++ b/app/server/site.js
@@ -28,7 +28,7 @@ constĀ api_tasks = api(app, 'task')
upload.init()
// app.use('/upload', require('./upload'))
-app.post('/folder/:id/upload/',
+app.post('/api/folder/:id/upload/',
multer.array('file'),
function (req, res, next){
if (! req.files || ! req.files.length) {
@@ -40,7 +40,7 @@ app.post('/folder/:id/upload/',
var folder_id = req.params.id
var dirname = process.env.S3_PATH + '/data/' + folder_id + '/'
var promises = req.files.map((file) => {
- console.log(file)
+ // console.log(file)
return new Promise( (resolve, reject) => {
upload.put({
file: file,
@@ -60,9 +60,9 @@ app.post('/folder/:id/upload/',
datatype: file.mimetype.split('/')[0],
activity: req.body.activity || 'url',
module: req.body.module,
- epoch: 0,
- generated: false,
- processed: false,
+ epoch: parseInt(req.body.epoch) || 0,
+ generated: req.body.generated === 'true',
+ processed: req.body.processed === 'true',
// username: req.user.get('username'),
}