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

allow to choose the mpm_event mod from the init.pp #323

Merged
merged 1 commit into from
Nov 7, 2013

Conversation

mhellmic
Copy link
Contributor

It seemed to me that you cannot configure the event mode from the init.pp, but only prefork and worker.

I changed it so the init.pp also accepts the string "event", and changed the mpm_event.pp filename to event.pp so it gets called.

@blkperl
Copy link
Contributor

blkperl commented Aug 27, 2013

Looks reasonable to me, 👍

@hunner
Copy link
Contributor

hunner commented Aug 27, 2013

Could you update the line 1 in event.pp to match the class name? Also if you could update https://github.com/puppetlabs/puppetlabs-apache/blob/master/spec/system/prefork_worker_spec.rb to be able to test the event mpm module that would be great!

@mhellmic
Copy link
Contributor Author

mhellmic commented Sep 3, 2013

Hi, sorry for the delay.

I integrated the changes and pushed.

@ptomulik
Copy link
Contributor

ptomulik commented Sep 4, 2013

Hi, also #342 adds event mpm. Actually it has 5 mpms defined (event, itk, peruser, prefork, worker).

@blkperl
Copy link
Contributor

blkperl commented Sep 24, 2013

Please rebase this.

@mhellmic
Copy link
Contributor Author

mhellmic commented Nov 5, 2013

I rebased on master. Is it acceptable now?
I would also be fine if you merge #342, but I don't understand what the status there is.

@apenney
Copy link
Contributor

apenney commented Nov 7, 2013

Sorry we've taken so long to reply to this! If you can rebase it again I'll get it merged for you.

added a mod/event.pp manifest and edited the spec test
of the prefork/worker/event modules.
@mhellmic
Copy link
Contributor Author

mhellmic commented Nov 7, 2013

I rebased and basically took your version of mod/event.pp. Hope that's alright.

apenney pushed a commit that referenced this pull request Nov 7, 2013
allow to choose the mpm_event mod from the init.pp
@apenney apenney merged commit 862c918 into puppetlabs:master Nov 7, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants