diff options
| author | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-07-08 23:02:06 +0000 |
|---|---|---|
| committer | luke <luke@980ebf18-57e1-0310-9a29-db15c13687c0> | 2007-07-08 23:02:06 +0000 |
| commit | 07f05195da27a9e3124d6b987a808c087dce334b (patch) | |
| tree | 7456354a592c332f22a983d3fc02658ea8de1842 /lib/puppet | |
| parent | e8217abac6638d73d742c3ecfb1c9792b3ef0803 (diff) | |
| download | puppet-07f05195da27a9e3124d6b987a808c087dce334b.tar.gz puppet-07f05195da27a9e3124d6b987a808c087dce334b.tar.xz puppet-07f05195da27a9e3124d6b987a808c087dce334b.zip | |
Making sure that #686 is fixed -- I specifically included the Daemon module in the Puppet mongrel server, and I call daemonize on the Puppet class, rather than the Mongrel http server
git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2659 980ebf18-57e1-0310-9a29-db15c13687c0
Diffstat (limited to 'lib/puppet')
| -rw-r--r-- | lib/puppet/network/server/mongrel.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/puppet/network/server/mongrel.rb b/lib/puppet/network/server/mongrel.rb index 3294ae274..1f1c2a448 100644 --- a/lib/puppet/network/server/mongrel.rb +++ b/lib/puppet/network/server/mongrel.rb @@ -33,6 +33,7 @@ require 'xmlrpc/server' require 'puppet/network/xmlrpc/server' require 'puppet/network/server' require 'puppet/network/client_request' +require 'puppet/daemon' require 'resolv' @@ -49,6 +50,7 @@ require 'resolv' # </pre> module Puppet::Network class Server::Mongrel < ::Mongrel::HttpHandler + include Puppet::Daemon attr_reader :xmlrpc_server def initialize(handlers) |