1 files changed, 52 insertions, 53 deletions
diff --git a/lib/puppet/network/server.rb b/lib/puppet/network/server.rb
index 84a71a6b4..50e3bd686 100644
--- a/lib/puppet/network/server.rb
+++ b/lib/puppet/network/server.rb
@@ -1,66 +1,65 @@
 class Puppet::Network::Server
-  attr_reader :server_type
+	attr_reader :server_type, :protocols, :address, :port
 
-  # which HTTP server subclass actually handles web requests of a certain type?  (e.g., :rest => RESTServer)
-  def self.server_class_by_name(name)
-    klass = (name.to_s + 'Server').to_sym
-    const_get klass
-  end
-  
-  # we will actually return an instance of the Server subclass which handles the HTTP web server, instead of 
-  # an instance of this generic Server class.  A tiny bit of sleight-of-hand is necessary to make this happen.
-  def self.new(args = {})
-    server_type = Puppet[:servertype] or raise "No servertype configuration found."
-    obj = self.server_class_by_name(server_type).allocate
-    obj.send :initialize, args.merge(:server_type => server_type)
-    obj
-  end
-  
-  def initialize(args = {})
-    @routes = {}
-    @listening = false
-    @server_type = args[:server_type]
-    self.register(args[:handlers]) if args[:handlers]
-  end
+    def initialize(args = {})
+        @server_type = Puppet[:servertype] or raise "No servertype configuration found."  # e.g.,  WEBrick, Mongrel, etc.
+        http_server_class || raise(ArgumentError, "Could not determine HTTP Server class for server type [#{@server_type}]")
+        @address = args[:address] || Puppet[:bindaddress] || 
+            raise(ArgumentError, "Must specify :address or configure Puppet :bindaddress.")
+        @port = args[:port] || Puppet[:masterport] ||
+            raise(ArgumentError, "Must specify :port or configure Puppet :masterport")
+	    @protocols = []
+	    @listening = false
+	    @routes = {}
+	    self.register(args[:handlers]) if args[:handlers]
+    end
 
-  def register(*indirections)
-    raise ArgumentError, "indirection names are required" if indirections.empty?
-    indirections.flatten.each { |i| @routes[i.to_sym] = true }
-  end
+    def register(*indirections)
+	    raise ArgumentError, "Indirection names are required." if indirections.empty?
+	    indirections.flatten.each { |i| @routes[i.to_sym] = true }
+    end
   
-  def unregister(*indirections)
-    indirections = @routes.keys if indirections.empty?
-    indirections.flatten.each do |i|
-      raise(ArgumentError, "indirection [%s] is not known" % i) unless @routes[i.to_sym]
-      @routes.delete(i.to_sym)
+    def unregister(*indirections)
+        raise "Cannot unregister indirections while server is listening." if listening?
+	    indirections = @routes.keys if indirections.empty?
+	    
+	    indirections.flatten.each do |i|
+	        raise(ArgumentError, "Indirection [%s] is unknown." % i) unless @routes[i.to_sym]
+        end
+        
+        indirections.flatten.each do |i|
+	        @routes.delete(i.to_sym)
+	    end
     end
-  end
 
-  def listening?
-    @listening
-  end
+    def listening?
+	    @listening
+    end
   
-  def listen
-    raise "Cannot listen -- already listening" if listening?
-    start_web_server
-    @listening = true
-  end
+    def listen
+	    raise "Cannot listen -- already listening." if listening?
+	    http_server.listen(@routes.dup)
+	    @listening = true
+    end
   
-  def unlisten
-    raise "Cannot unlisten -- not currently listening" unless listening?
-    stop_web_server
-    @listening = false
-  end
+    def unlisten
+	    raise "Cannot unlisten -- not currently listening." unless listening?
+	    http_server.unlisten   
+	    @listening = false
+    end
+    
+    def http_server_class
+        http_server_class_by_type(@server_type)
+    end
 
   private
   
-  def start_web_server
-    raise NotImplementedError, "this method needs to be implemented by the actual web server (sub)class"
-  end
-  
-  def stop_web_server
-    raise NotImplementedError, "this method needs to be implemented by the actual web server (sub)class"
-  end
+    def http_server
+        @http_server ||= http_server_class.new
+    end
+    
+    def http_server_class_by_type(kind)
+        Puppet::Network::HTTP.server_class_by_type(kind)
+    end
 end
 
-