diff options
| -rw-r--r-- | app/server/db/model.js | 2 | ||||
| -rw-r--r-- | app/server/db/models.js | 8 | ||||
| -rw-r--r-- | app/server/site.js | 4 |
3 files changed, 5 insertions, 9 deletions
diff --git a/app/server/db/model.js b/app/server/db/model.js index 1f5d8f9..dd851bf 100644 --- a/app/server/db/model.js +++ b/app/server/db/model.js @@ -107,8 +107,6 @@ module.exports = function modelScope(type, db_model, _props) { }, create: (data) => { - console.log(">>>>>>", data) - console.log(">>>>>>>>>", data.should_relay) return new Promise( (resolve, reject) => { const should_relay = data.should_relay === 'true' crud.create( model.sanitize(data) ).then( (rec) => { diff --git a/app/server/db/models.js b/app/server/db/models.js index 548f0c5..24be774 100644 --- a/app/server/db/models.js +++ b/app/server/db/models.js @@ -42,15 +42,9 @@ module.exports = { }), file: model('file', File, { fields: "folder_id username name url mime datatype duration analysis size stars activity module checkpoint dataset epoch processed generated opt created_at updated_at".split(" "), - afterCreate: (file, should_relay) => { + afterCreate: (file) => { console.log('created file') // bridge.processFiles() - console.log(should_relay) - if (should_relay) { // if this came from an automated command... - const client = require('../bridge').client - client.emit('api_res', { type: 'create', datatype: 'file', data: file.toJSON() }) - console.log("RELAYINED") - } } }), task: model('task', Task, { diff --git a/app/server/site.js b/app/server/site.js index 870cfee..89a3ad5 100644 --- a/app/server/site.js +++ b/app/server/site.js @@ -71,6 +71,10 @@ app.post('/api/folder/:id/upload/', api_files.create(data).then( (db_file) => { console.log(db_file) + if (req.body.should_relay === "true" || req.body.generated === "true") { // if this came from an automated command... + const client = require('./bridge').client + client.emit('api_res', { type: 'create', datatype: 'file', data: db_file.toJSON() }) + } resolve(db_file) }).catch( (err) => { console.warn(err) |