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

Add server_max_queued_requests and server_max_retry_delay parameters #570

Conversation

baurmatt
Copy link
Contributor

@baurmatt baurmatt commented Dec 22, 2017

Copy link
Contributor

@mmoll mmoll left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This only works for Puppetserver >= 5.1, so there needs to be an added version check

@theforeman-bot
Copy link
Member

@baurmatt, the Redmine ticket used is for a different project than the one associated with this GitHub repository. Please either:

If changing the ticket number used, remember to update the PR title and the commit message (using git commit --amend).


This message was auto-generated by Foreman's prprocessor

@baurmatt
Copy link
Contributor Author

baurmatt commented Jan 4, 2018

Yes of course -.- It should now be fixed.

Edit: Not sure what @theforeman-bot wants from me :D

@theforeman-bot
Copy link
Member

@baurmatt, the Redmine ticket used is for a different project than the one associated with this GitHub repository. Please either:

If changing the ticket number used, remember to update the PR title and the commit message (using git commit --amend).


This message was auto-generated by Foreman's prprocessor

@ekohl
Copy link
Member

ekohl commented Jan 4, 2018

We have the convention that #xxx refers to our Redmine issues while GH-xxx refers to Github issues. Could you amend the commit message to use that syntax?

@baurmatt baurmatt force-pushed the feature/add-max-queued-requests-and-max-retry-delay branch from 5e048c4 to da3693c Compare January 4, 2018 13:22
@baurmatt
Copy link
Contributor Author

baurmatt commented Jan 4, 2018

Ah, yeah sure. Its fixed now :)

Copy link
Member

@ekohl ekohl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Other than the testing code (only mentioned once) it looks good.

)
end
it 'should have max-queued-requests: 0' do
content = catalogue.resource('file', '/etc/custom/puppetserver/conf.d/puppetserver.conf').send(:parameters)[:content]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have a verify_content for this, or the regular expected.to contain_file('/etc/custom/...').with_content(/^ max-queued-requests: 0$/) should work.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've just copied it from another test in this file, seems like there are a lot of options which are used in those tests ;) Switched to expected.to contain_file... :)

@baurmatt baurmatt force-pushed the feature/add-max-queued-requests-and-max-retry-delay branch from da3693c to b4e211e Compare January 4, 2018 15:23
Copy link
Member

@ekohl ekohl left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The failure looks unrelated. I'm trying to tackle that in #573

@mmoll mmoll merged commit f1fbfe8 into theforeman:master Jan 4, 2018
@mmoll
Copy link
Contributor

mmoll commented Jan 4, 2018

merged, danke @baurmatt!

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

Successfully merging this pull request may close these issues.

4 participants