kirk 0.2.0.beta.2-java → 0.2.0.beta.3-java

data/lib/kirk/server/builder.rb

@@ -65,12 +65,15 @@ module Kirk
         @current.hosts.concat hosts
       end
 
-      def listen(listen)
-        listen = listen.to_s
-        listen = ":#{listen}" unless listen.index(':')
-        listen = "0.0.0.0#{listen}" if listen.index(':') == 0
+      def listen(*listeners)
+        listeners = listeners.map do |listener|
+          listener = listener.to_s
+          listener = ":#{listener}"   unless listener.index(':')
+          listener = "0.0.0.0#{listener}" if listener.index(':') == 0
+          listener
+        end
 
-        @current.listen = listen
+        @current.listen = listeners
       end
 
       def watch(*watch)
@@ -88,7 +91,7 @@ module Kirk
             application = HotDeployable.new(c)
             application.add_watcher(watcher)
 
-            ctx.set_connector_names [c.listen]
+            ctx.set_connector_names c.listen
             ctx.set_handler application
           end
         end
@@ -102,15 +105,17 @@ module Kirk
         @connectors = {}
 
         @configs.each do |config|
-          next if @connectors.key?(config.listen)
+          config.listen.each do |listener|
+            next if @connectors.key?(listener)
 
-          host, port = config.listen.split(':')
+            host, port = listener.split(':')
 
-          connector = Jetty::SelectChannelConnector.new
-          connector.set_host(host)
-          connector.set_port(port.to_i)
+            connector = Jetty::SelectChannelConnector.new
+            connector.set_host(host)
+            connector.set_port(port.to_i)
 
-          @connectors[config.listen] = connector
+            @connectors[listener] = connector
+          end
         end
 
         @connectors.values
@@ -135,7 +140,7 @@ module Kirk
 
       def new_config
         ApplicationConfig.new.tap do |config|
-          config.listen         = '0.0.0.0:9090'
+          config.listen         = ['0.0.0.0:9090']
           config.watch          = [ ]
           config.bootstrap_path = File.expand_path('../bootstrap.rb', __FILE__)
         end

data/lib/kirk/server/handler.rb

@@ -15,6 +15,7 @@ module Kirk
       QUERY_STRING   = 'QUERY_STRING'.freeze
       SERVER_NAME    = 'SERVER_NAME'.freeze
       SERVER_PORT    = 'SERVER_PORT'.freeze
+      LOCAL_PORT     = 'LOCAL_PORT'.freeze
       CONTENT_TYPE   = 'CONTENT_TYPE'.freeze
       CONTENT_LENGTH = 'CONTENT_LENGTH'.freeze
       REQUEST_URI    = 'REQUEST_URI'.freeze
@@ -73,7 +74,8 @@ module Kirk
             REMOTE_HOST     => request.get_remote_host  || "",
             REMOTE_ADDR     => request.get_remote_addr  || "",
             REMOTE_USER     => request.get_remote_user  || "",
-            SERVER_PORT     => request.get_local_port.to_s,
+            SERVER_PORT     => request.get_server_port.to_s,
+            LOCAL_PORT      => request.get_local_port.to_s,
             RACK_VERSION    => ::Rack::VERSION)
 
           # Process the content length

data/lib/kirk/version.rb

@@ -1,4 +1,4 @@
 module Kirk
   NAME    = "kirk".freeze
-  VERSION = "0.2.0.beta.2".freeze
+  VERSION = "0.2.0.beta.3".freeze
 end

metadata

@@ -2,7 +2,7 @@
 name: kirk
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 0.2.0.beta.2
+  version: 0.2.0.beta.3
 platform: java
 authors: 
   - Carl Lerche