diff options
| author | Luke Kanies <luke@madstop.com> | 2009-02-02 17:19:07 -0600 |
|---|---|---|
| committer | Luke Kanies <luke@madstop.com> | 2009-02-06 18:08:43 -0600 |
| commit | c0fcb2137e66af8ba60a959faa221034c6832b69 (patch) | |
| tree | 10f62605333979ea64445dca5d4d66d58237de97 /lib/puppet/network/http_server | |
| parent | 700e823f7c33eb3c5b4d9e467742fd24f63bbeef (diff) | |
| download | puppet-c0fcb2137e66af8ba60a959faa221034c6832b69.tar.gz puppet-c0fcb2137e66af8ba60a959faa221034c6832b69.tar.xz puppet-c0fcb2137e66af8ba60a959faa221034c6832b69.zip | |
Creating and using a new Puppet::Daemon class
This replaces the short-lived EventManager class, all of
the service- and timer-related code in puppet.rb, and moves
code from agent.rb, server.rb, and other places into one
class responsible for starting, stopping, pids, and more.
The Daemon module is no longer in existence, so it's been
removed from the classes that were using it.
Signed-off-by: Luke Kanies <luke@madstop.com>
Diffstat (limited to 'lib/puppet/network/http_server')
| -rw-r--r-- | lib/puppet/network/http_server/mongrel.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/network/http_server/webrick.rb | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/lib/puppet/network/http_server/mongrel.rb b/lib/puppet/network/http_server/mongrel.rb index e9421c781..924c11728 100644 --- a/lib/puppet/network/http_server/mongrel.rb +++ b/lib/puppet/network/http_server/mongrel.rb @@ -34,7 +34,6 @@ require 'puppet/network/xmlrpc/server' require 'puppet/network/http_server' require 'puppet/network/client_request' require 'puppet/network/handler' -require 'puppet/daemon' require 'resolv' @@ -51,7 +50,6 @@ require 'resolv' # </pre> module Puppet::Network class HTTPServer::Mongrel < ::Mongrel::HttpHandler - include Puppet::Daemon attr_reader :xmlrpc_server def initialize(handlers) diff --git a/lib/puppet/network/http_server/webrick.rb b/lib/puppet/network/http_server/webrick.rb index 568b4e798..0e835d057 100644 --- a/lib/puppet/network/http_server/webrick.rb +++ b/lib/puppet/network/http_server/webrick.rb @@ -1,5 +1,4 @@ require 'puppet' -require 'puppet/daemon' require 'webrick' require 'webrick/https' require 'fcntl' @@ -16,7 +15,6 @@ module Puppet # The old-school, pure ruby webrick server, which is the default serving # mechanism. class HTTPServer::WEBrick < WEBrick::HTTPServer - include Puppet::Daemon include Puppet::SSLCertificates::Support # Read the CA cert and CRL and populate an OpenSSL::X509::Store |