-
Notifications
You must be signed in to change notification settings - Fork 1.4k
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.
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
fix(pool): added optional setting for killing processes and not retaining them #1173
Open
dawiss1337
wants to merge
5
commits into
OptimalBits:develop
Choose a base branch
from
dawiss1337:master
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
ac446e4
fix(pool): added optional setting for killing processes and not retai…
ff7774a
fix(test): removed unnecessary variable reassigning
a8d3cd0
rendamed functions and variables, removed redundant code
2b5bfdc
updated test code
df11111
Merge branch 'develop' into master
manast File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -229,7 +229,8 @@ var Queue = function Queue(name, url, opts) { | |
guardInterval: 5000, | ||
retryProcessDelay: 5000, | ||
drainDelay: 5, | ||
backoffStrategies: {} | ||
backoffStrategies: {}, | ||
keepProcesses: true | ||
}); | ||
|
||
this.settings.lockRenewTime = | ||
|
@@ -250,6 +251,13 @@ var Queue = function Queue(name, url, opts) { | |
this.processJob = this.processJob.bind(this); | ||
this.getJobFromId = Job.fromId.bind(null, this); | ||
|
||
// Check settings to see if processes will be kept after finishing processing, default set to true | ||
this.keepProcesses = | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Since we are setting a default value |
||
this.settings.keepProcesses !== undefined && | ||
this.settings.keepProcesses === false | ||
? false | ||
: true; | ||
|
||
var keys = {}; | ||
_.each( | ||
[ | ||
|
@@ -672,6 +680,10 @@ Queue.prototype.start = function(concurrency) { | |
}); | ||
}; | ||
|
||
Queue.prototype.setKeepProcesses = function(keepProcesses) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I do not think we need a setter for this setting, as with the other settings. |
||
this.keepProcesses = keepProcesses; | ||
}; | ||
|
||
Queue.prototype.setHandler = function(name, handler) { | ||
if (!handler) { | ||
throw new Error('Cannot set an undefined handler'); | ||
|
@@ -691,6 +703,7 @@ Queue.prototype.setHandler = function(name, handler) { | |
} | ||
|
||
this.childPool = this.childPool || require('./process/child-pool')(); | ||
this.childPool.setKeepProcesses(this.keepProcesses); | ||
|
||
var sandbox = require('./process/sandbox'); | ||
this.handlers[name] = sandbox(handler, this.childPool).bind(this); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am thinking that it would be better to change the name to a more explanatory:
setReuseProcesses
or similar.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
renamed the methods and variables in the latest PR