Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging https://github.com/CollectionFS/Meteor-CollectionFS/pull/914 #1

Merged
merged 3 commits into from
Jan 27, 2016
Merged

Merging https://github.com/CollectionFS/Meteor-CollectionFS/pull/914 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a12d2b1
Fixing issue https://github.com/CollectionFS/Meteor-CollectionFS/issu…
Jan 12, 2016
0706aa3
Use env var COLLECTIONFS_ENV_NAME_UNIQUE_ID to find the node instance…
Jan 22, 2016
39a7b68
Correction : suppress 1 tracker query
Jan 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions packages/tempstore/tempStore.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,16 @@ FS.TempStore.createWriteStream = function(fileObj, options) {
setObj['keys.' + chunkNum] = result.fileKey;
tracker.update(selector, {$set: setObj});


var temp = tracker.findOne(selector);

if(!temp){
FS.debug && console.log('NOT FOUND FROM TEMPSTORE => EXIT (REMOVED)');
return;
}

// Get updated chunkCount
var chunkCount = FS.Utility.size(tracker.findOne(selector).keys);
var chunkCount = FS.Utility.size(temp.keys);

// Progress
self.emit('progress', fileObj, chunkNum, chunkCount, chunkSum, result);
Expand All @@ -304,6 +312,9 @@ FS.TempStore.createWriteStream = function(fileObj, options) {
// We no longer need the chunk info
var modifier = { $set: {}, $unset: {chunkCount: 1, chunkSum: 1, chunkSize: 1} };

if(!fileObj.instance_id)
modifier.$set.instance_id = process.env.COLLECTIONFS_ENV_NAME_UNIQUE_ID ? process.env[process.env.COLLECTIONFS_ENV_NAME_UNIQUE_ID] : process.env.METEOR_PARENT_PID;

// Check if the file has been uploaded before
if (typeof fileObj.uploadedAt === 'undefined') {
// We set the uploadedAt date
Expand All @@ -324,8 +335,14 @@ FS.TempStore.createWriteStream = function(fileObj, options) {
// XXX is emitting "ready" necessary?
self.emit('ready', fileObj, chunkCount, result);
} else {
// Update the chunkCount on the fileObject
fileObj.update({ $set: {chunkCount: chunkCount} });

var modifier = { $set: {}};
if(!fileObj.instance_id)
modifier.$set.instance_id = process.env.COLLECTIONFS_ENV_NAME_UNIQUE_ID ? process.env[process.env.COLLECTIONFS_ENV_NAME_UNIQUE_ID] : process.env.METEOR_PARENT_PID;

modifier.$set.chunkCount = chunkCount;

fileObj.update(modifier);
}
});

Expand Down
10 changes: 9 additions & 1 deletion packages/worker/fileWorker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,14 @@ FS.FileWorker.observe = function(fsCollection) {

// Initiate observe for finding files that have been stored so we can delete
// any temp files
/*
fsCollection.files.find(getDoneQuery(fsCollection.options.stores)).observe({
added: function(fsFile) {
FS.debug && console.log("FileWorker ADDED - calling deleteChunks for", fsFile._id);
FS.TempStore.removeFile(fsFile);
}
});
*/

// Initiate observe for catching files that have been removed and
// removing the data from all stores as well
Expand Down Expand Up @@ -84,6 +86,7 @@ function getReadyQuery(storeName) {
var selector = {uploadedAt: {$exists: true}};
selector['copies.' + storeName] = null;
selector['failures.copies.' + storeName + '.doneTrying'] = {$ne: true};
selector['instance_id'] = process.env.COLLECTIONFS_ENV_NAME_UNIQUE_ID ? process.env[process.env.COLLECTIONFS_ENV_NAME_UNIQUE_ID] : process.env.METEOR_PARENT_PID;
return selector;
}

Expand Down Expand Up @@ -141,7 +144,7 @@ function getDoneQuery(stores) {
tempCond['failures.copies.' + storeName + '.doneTrying'] = true;
copyCond.$or.push(tempCond);
selector.$and.push(copyCond);
})
});

return selector;
}
Expand Down Expand Up @@ -172,6 +175,11 @@ function saveCopy(fsFile, storeName, options) {
var writeStream = storage.adapter.createWriteStream(fsFile);
var readStream = FS.TempStore.createReadStream(fsFile);

writeStream.on('finish',Meteor.bindEnvironment(function(){
FS.debug && console.log('finish', fsFile._id);
FS.TempStore.removeFile(fsFile);
}));

// Pipe the temp data into the storage adapter
readStream.pipe(writeStream);
}