-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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
(MODULES-2062) updates prefork.conf params for apache 2.4 #1685
Conversation
MaxClients is now MaxRequestWorkers and MaxRequestsPerChild is now MaxConnectionsPerChild. This updates the manifest, template, and adds a couple unit tests. Unit tests for every OS did not seem necessary since all that is being tested is an if block.
|
Cheers ! |
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 realize it's been merged but I can submit a PR if you agree it should be changed.
| @@ -23,6 +25,15 @@ | |||
| if defined(Class['apache::mod::worker']) { | |||
| fail('May not include both apache::mod::prefork and apache::mod::worker on the same node') | |||
| } | |||
|
|
|||
| if versioncmp($_apache_version, '2.3.13') < 0 { | |||
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.
Shouldn't this be >= 0?
| <%- if @maxrequestworkers -%> | ||
| MaxRequestWorkers <%= @maxrequestworkers %> | ||
| <%- elsif @maxclients -%> | ||
| MaxClients <%= @maxclients %> |
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.
Would you mind keeping the whitespace? That results in a smaller diff on clients.
| <%- if @maxconnectionsperchild -%> | ||
| MaxConnectionsPerChild <%= @maxconnectionsperchild %> | ||
| <%- elsif @maxrequestsperchild -%> | ||
| MaxRequestsPerChild <%= @maxrequestsperchild %> |
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.
Same here.
(MODULES-2062) updates prefork.conf params for apache 2.4
MaxClients is now MaxRequestWorkers and MaxRequestsPerChild is now MaxConnectionsPerChild. This updates the manifest, template, and adds a couple unit tests. Unit tests for every OS did not seem necessary since all that is being tested is an if block.