Skip to content

Commit

Permalink
Merge pull request #776 from webgme/worker_fix_maxConcurrentJobs
Browse files Browse the repository at this point in the history
executor/worker: fix maxConcurrentJobs
  • Loading branch information
Patrik Meijer committed Jan 6, 2016
2 parents 16aa304 + 5d50c70 commit 013747b
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/server/middleware/executor/worker/node_worker.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ if (typeof define !== 'undefined') {
], function (eventDispatcher, BlobClient, ExecutorWorker, JobInfo, ExecutorWorkerController, url) {
'use strict';

return function (webGMEUrl, tempPath, parameters) {
return function (webGMEUrl, tempPath, parameters, availableProcessesContainer) {
var worker,
webGMEPort = url.parse(webGMEUrl).port || (url.parse(webGMEUrl).protocol === 'https:' ? 443 : 80);

Expand Down Expand Up @@ -178,11 +178,11 @@ if (nodeRequire.main === module) {
} else {
webGMEUrls[webGMEUrl] = addWebGMEConnection(webGMEUrl,
path.join(workingDirectory, '' + workingDirectoryCount++),
config[webGMEUrl]);
config[webGMEUrl], availableProcessesContainer);
}
} else if (key === 'maxConcurrentJobs') {
availableProcessesContainer.availableProcesses += config[maxConcurrentJobs] - maxConcurrentJobs;
maxConcurrentJobs = config[maxConcurrentJobs];
availableProcessesContainer.availableProcesses += config.maxConcurrentJobs - maxConcurrentJobs;
maxConcurrentJobs = config.maxConcurrentJobs;
} else {
log('Unknown configuration key ' + key);
}
Expand Down

0 comments on commit 013747b

Please sign in to comment.