Fix daemonization broken in #219 #224
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
| it 'raises if Celluloid is already loaded' do | ||
| expect(cli).to receive(:celluloid_loaded?).and_return(true) | ||
| args = { daemon: true, logfile: '/dev/null' } | ||
| expect{ cli.send(:daemonize, args) }.to raise_error(RuntimeError) |
mariokostelac
force-pushed
the
fix_daemonization
branch
from
a2079fd
to
3acea82
Compare
| end | ||
|
|
||
| it 'raises if logfile is not set' do | ||
| expect { cli.send(:daemonize, { daemon: true }) }.to raise_error(ArgumentError) |
There was a problem hiding this comment.
Redundant curly braces around a hash parameter.
|
|
||
| EnvironmentLoader.load(options) | ||
|
|
||
| load_celluloid |
There was a problem hiding this comment.
we have to load celluloid later so we could attach logger properly.
|
@phstc you good with this PR? :) |
| @@ -64,21 +64,27 @@ def run(args) | |||
| private | |||
|
|
|||
| def load_celluloid | |||
| raise "Celluloid cannot be required until here, or it will break Shoryuken's daemonization" if defined?(::Celluloid) && Shoryuken.options[:daemon] | |||
There was a problem hiding this comment.
@phstc it's just moved from here :)
|
@mariokostelac looks good to me |
|
Sorry for breaking this 😩 and thanks for fixing it @mariokostelac ! |
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.
No description provided.