diff options
| author | Ian Taylor <ian@lorf.org> | 2009-06-05 12:39:04 -0400 |
|---|---|---|
| committer | James Turnbull <james@lovedthanlost.net> | 2009-06-06 09:12:00 +1000 |
| commit | 4f2c066a97e59a89df64af4b25beac6f3f0553c2 (patch) | |
| tree | 126540beec3c65448e01e1b48d27275ec4ee6ea4 /lib/puppet/network/http | |
| parent | 97e6975d69f239e24993315a25a3117b1daa48c3 (diff) | |
| download | puppet-4f2c066a97e59a89df64af4b25beac6f3f0553c2.tar.gz puppet-4f2c066a97e59a89df64af4b25beac6f3f0553c2.tar.xz puppet-4f2c066a97e59a89df64af4b25beac6f3f0553c2.zip | |
Removed extra whitespace from end of lines
Diffstat (limited to 'lib/puppet/network/http')
| -rw-r--r-- | lib/puppet/network/http/handler.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/network/http/mongrel.rb | 14 | ||||
| -rw-r--r-- | lib/puppet/network/http/mongrel/rest.rb | 2 | ||||
| -rw-r--r-- | lib/puppet/network/http/webrick.rb | 16 |
4 files changed, 17 insertions, 17 deletions
diff --git a/lib/puppet/network/http/handler.rb b/lib/puppet/network/http/handler.rb index 679bb8dcd..9528d39a6 100644 --- a/lib/puppet/network/http/handler.rb +++ b/lib/puppet/network/http/handler.rb @@ -165,7 +165,7 @@ module Puppet::Network::HTTP::Handler def path(request) raise NotImplementedError - end + end def request_key(request) raise NotImplementedError diff --git a/lib/puppet/network/http/mongrel.rb b/lib/puppet/network/http/mongrel.rb index 356402545..6c39bb37f 100644 --- a/lib/puppet/network/http/mongrel.rb +++ b/lib/puppet/network/http/mongrel.rb @@ -6,7 +6,7 @@ class Puppet::Network::HTTP::Mongrel def initialize(args = {}) @listening = false end - + def listen(args = {}) raise ArgumentError, ":protocols must be specified." if !args[:protocols] or args[:protocols].empty? raise ArgumentError, ":address must be specified." unless args[:address] @@ -15,26 +15,26 @@ class Puppet::Network::HTTP::Mongrel @protocols = args[:protocols] @xmlrpc_handlers = args[:xmlrpc_handlers] - @server = Mongrel::HttpServer.new(args[:address], args[:port]) + @server = Mongrel::HttpServer.new(args[:address], args[:port]) setup_handlers @listening = true @server.run end - + def unlisten raise "Mongrel server is not listening" unless listening? @server.stop @server = nil @listening = false end - + def listening? @listening end - + private - + def setup_handlers # Register our REST support at / klass = class_for_protocol(:rest) @@ -49,7 +49,7 @@ class Puppet::Network::HTTP::Mongrel def setup_xmlrpc_handlers @server.register('/RPC2', Puppet::Network::HTTPServer::Mongrel.new(@xmlrpc_handlers)) end - + def class_for_protocol(protocol) return Puppet::Network::HTTP::MongrelREST if protocol.to_sym == :rest raise ArgumentError, "Unknown protocol [#{protocol}]." diff --git a/lib/puppet/network/http/mongrel/rest.rb b/lib/puppet/network/http/mongrel/rest.rb index fe3f51d35..369d4c6c4 100644 --- a/lib/puppet/network/http/mongrel/rest.rb +++ b/lib/puppet/network/http/mongrel/rest.rb @@ -30,7 +30,7 @@ class Puppet::Network::HTTP::MongrelREST < Mongrel::HttpHandler # what path was requested? def path(request) - # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] + # LAK:NOTE See http://snurl.com/21zf8 [groups_google_com] #x = '/' + request.params[Mongrel::Const::REQUEST_PATH] request.params[Mongrel::Const::REQUEST_PATH] end diff --git a/lib/puppet/network/http/webrick.rb b/lib/puppet/network/http/webrick.rb index 46735c0f5..a60a22ba1 100644 --- a/lib/puppet/network/http/webrick.rb +++ b/lib/puppet/network/http/webrick.rb @@ -12,19 +12,19 @@ class Puppet::Network::HTTP::WEBrick @listening = false @mutex = Mutex.new end - + def self.class_for_protocol(protocol) return Puppet::Network::HTTP::WEBrickREST if protocol.to_sym == :rest raise "Unknown protocol [#{protocol}]." end - + def listen(args = {}) raise ArgumentError, ":protocols must be specified." if !args[:protocols] or args[:protocols].empty? raise ArgumentError, ":address must be specified." unless args[:address] raise ArgumentError, ":port must be specified." unless args[:port] - + @protocols = args[:protocols] - @xmlrpc_handlers = args[:xmlrpc_handlers] + @xmlrpc_handlers = args[:xmlrpc_handlers] arguments = {:BindAddress => args[:address], :Port => args[:port]} arguments.merge!(setup_logger) @@ -35,12 +35,12 @@ class Puppet::Network::HTTP::WEBrick setup_handlers @mutex.synchronize do - raise "WEBrick server is already listening" if @listening + raise "WEBrick server is already listening" if @listening @listening = true @thread = Thread.new { @server.start } end end - + def unlisten @mutex.synchronize do raise "WEBrick server is not listening" unless @listening @@ -50,7 +50,7 @@ class Puppet::Network::HTTP::WEBrick @listening = false end end - + def listening? @mutex.synchronize do @listening @@ -110,7 +110,7 @@ class Puppet::Network::HTTP::WEBrick end private - + def setup_handlers # Set up the new-style protocols. klass = self.class.class_for_protocol(:rest) |
