Fix option initialization for queues #195
Merged
Conversation
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 is necessary for invoking shoryuken directly, while maintaining support for loading via `EnvironmentLoader#load`. This is useful when configuration options are set via the environment through a gem (e.g. dotenv).
| @@ -92,6 +92,7 @@ def load_rails | |||
| require File.expand_path('config/environment.rb') | |||
| end | |||
|
|
|||
| Shoryuken.options.merge!(config_file_options) | |||
There was a problem hiding this comment.
@laCour is it a possible fix for what @waynerobinson commented out here?
There was a problem hiding this comment.
@phstc I've updated the PR to fix this issue as well. The options passed from the CLI were destructively overwriting the options from the configuration file on merge, because an empty array was being passed.
laCour
changed the title
laCour
changed the title
|
@laCour Thanks a lot! Added to master 🍻 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This corrects option initialization when invoking
shoryukenvia the command line, and also fixes setting configuration options using the Rails environment with gems like dotenv.Since PR #191, queues from the configuration file were being overwritten by the command line's default options—effectively being ignored.