Navigation Menu

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.

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

Consider Default Required Path on Config File Search #4077

Merged
merged 2 commits into from Jan 8, 2019

Conversation

Tensho
Copy link
Contributor

@Tensho Tensho commented Jan 8, 2019

Fixes #4075

To find out the config file dir we make the next assumptions with the corresponding precedence:

  1. CLI :require option is an existing dir – take it for config/sidekiq.yml
  2. CLI :require option is a file – take default Sidekiq:require option – . (current directory)
  3. CLI :require option is ommitted – take default Sidekiq:require option – . (current directory)

In tests we stub default Sidekiq :require option (.) with the dummy app folder (./test/dummy).

@Tensho Tensho self-assigned this Jan 8, 2019
@Tensho Tensho requested a review from mperham January 8, 2019 10:23
@greysteil
Copy link

I wrote the #4076 for this. I don't think this fix will work.

In particular, you want to have a test like the one I've added there - where no -r or -C option is specified.

@Tensho
Copy link
Contributor Author

Tensho commented Jan 8, 2019

Sorry, why do you think it will not work? Here is the spec for bare sidekiq CLI command.

@greysteil
Copy link

Oh, good point, actually that will work - had got confused about setting require in the default options, but you're totally right.

@mperham mperham merged commit a281aa4 into master Jan 8, 2019
@mperham mperham deleted the default-config-file branch January 8, 2019 17:21
@mperham
Copy link
Collaborator

mperham commented Jan 8, 2019

master should be fixed now, anyone want to confirm?

@ghost
Copy link

ghost commented Jan 8, 2019

master should be fixed now, anyone want to confirm?

Master seems to have fixed it for my deployment

@trevorrjohn
Copy link

master should be fixed now, anyone want to confirm?

Yep, can confirm this fix as well.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants