diff options
| author | Rick Bradley <rick@rickbradley.com> | 2007-10-05 19:51:47 -0500 |
|---|---|---|
| committer | Rick Bradley <rick@rickbradley.com> | 2007-10-05 19:51:47 -0500 |
| commit | a7d220b828ec5f277a3a3bfb33f517fe864579d0 (patch) | |
| tree | a538fd3d621e5eab38a5ee874f64e5e89235bd10 /bin/puppetd | |
| parent | 7086ce17d14274f93ef0c03fba531bdb6710e5f7 (diff) | |
| download | puppet-a7d220b828ec5f277a3a3bfb33f517fe864579d0.tar.gz puppet-a7d220b828ec5f277a3a3bfb33f517fe864579d0.tar.xz puppet-a7d220b828ec5f277a3a3bfb33f517fe864579d0.zip | |
Moving the webrick/mongrel "servers" over to HTTPServer module instead of Server. Using Server as the master class for client connections. Server (former RESTServer) will instantiate the appropriate subclass based upon Puppet configurator setting. There are now tests broken in the network section which I can't seem to figure out yet. Not a happy place to be.
Diffstat (limited to 'bin/puppetd')
| -rwxr-xr-x | bin/puppetd | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/puppetd b/bin/puppetd index a09d3c73b..1235a36fe 100755 --- a/bin/puppetd +++ b/bin/puppetd @@ -390,10 +390,10 @@ if Puppet[:listen] and ! options[:onetime] args[:Handlers] = handlers args[:Port] = Puppet[:puppetport] - require 'puppet/network/server/webrick' + require 'puppet/network/http_server/webrick' begin - server = Puppet::Network::Server::WEBrick.new(args) + server = Puppet::Network::HTTPServer::WEBrick.new(args) rescue => detail $stderr.puts detail puts detail.backtrace |