ringleader 1.1.5.pre0 → 1.1.5.pre1

data/.ruby-version

@@ -0,0 +1 @@
+1.9.3-p392

data/lib/ringleader/app.rb

@@ -35,9 +35,16 @@ module Ringleader
       end
     end
 
-    def stop
+    def stop(forever=false)
       return unless @process.running?
       info "stopping #{@config.name}..."
+
+      if forever
+        # stop processing requests
+        @server.close
+        @server = nil
+      end
+
       stop_activity_timer
       @process.stop
     end
@@ -61,15 +68,17 @@ module Ringleader
       info "disabling #{@config.name}..."
       return unless @server
       stop_activity_timer
-      @process.stop
       @server.close
       @server = nil
+      @process.stop
       @enabled = false
     end
 
-    def finalize
-      @server.close if @server
+    def close_server_socket
+      @server.close if @server && !@server.closed?
+      @server = nil
     end
+    finalizer :close_server_socket
 
     def run
       info "listening for connections for #{@config.name} on #{@config.host}:#{@config.server_port}"
@@ -92,8 +101,16 @@ module Ringleader
       end
     end
 
-    def proxy_to_app(socket)
-      SocketProxy.new socket, @config.host, @config.app_port
+    def proxy_to_app(upstream)
+      debug "proxying to #{@config.host}:#{@config.app_port}"
+
+      downstream = TCPSocket.new(@config.host, @config.app_port)
+      async.proxy downstream, upstream
+      async.proxy upstream, downstream
+
+    rescue IOError, SystemCallError => e
+      error "could not proxy to #{@config.host}:#{@config.app_port}: #{e}"
+      upstream.close
     end
 
     def start_activity_timer
@@ -118,5 +135,14 @@ module Ringleader
       end
     end
 
+    def proxy(from, to)
+      ::IO.copy_stream from, to
+    rescue IOError, SystemCallError
+      # from or to were closed or connection was reset
+    ensure
+      from.close unless from.closed?
+      to.close unless to.closed?
+    end
+
   end
 end

data/lib/ringleader/controller.rb

@@ -23,7 +23,7 @@ module Ringleader
       @stopping = true
       info "shutting down..."
       @apps.values.map do |app|
-        Thread.new { app.stop if app.alive? }
+        Thread.new { app.stop(:forever) if app.alive? }
       end.map(&:join)
     end
   end

data/lib/ringleader/process.rb

@@ -30,7 +30,6 @@ module Ringleader
     #
     # Returns true if the app started, false if not.
     def start
-      return false if @stopping
       if @running
         true
       elsif @starting
@@ -55,7 +54,6 @@ module Ringleader
     # zombies), use KILL instead.
     def stop
       return unless @pid
-      @stopping = true
 
       children = child_pids @pid
 
@@ -96,7 +94,6 @@ module Ringleader
       @pid = nil
       @wait_for_port.terminate if @wait_for_port.alive?
       @wait_for_exit.terminate if @wait_for_exit.alive?
-      @stopping = nil
       signal :running, false
     end
 
@@ -156,8 +153,10 @@ module Ringleader
       socket = TCPSocket.new config.host, config.app_port
       socket.close
       true
-    rescue Errno::ECONNREFUSED
+    rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT
       false
+    rescue IOError, SystemCallError => e
+      error "unexpected error when checking status: #{e}"
     end
 
     # Internal: proxy output streams to the logger.

data/lib/ringleader/server.rb

@@ -1,6 +1,5 @@
 module Ringleader
   class Server < Reel::Server
-    include Celluloid::IO # hurk
     include Celluloid::Logger
 
     ASSET_PATH = Pathname.new(File.expand_path("../../../assets", __FILE__))
@@ -15,11 +14,11 @@ module Ringleader
 
     def on_connection(connection)
       request = connection.request
-      route connection, request if request
+      route request if request
     end
 
     # thanks to dcell explorer for this code
-    def route(connection, request)
+    def route(request)
       if request.url == "/"
         path = "index.html"
       else
@@ -27,66 +26,68 @@ module Ringleader
       end
 
       if !path or path[".."]
-        connection.respond :not_found, "Not found"
+        request.respond :not_found, "Not found"
         debug "404 #{path}"
         return
       end
 
       case request.method
-      when :get
+      when "GET"
         if path == "apps"
-          app_index connection
+          app_index request
         elsif path =~ %r(^apps/\w+)
-          show_app path, request.body, connection
+          show_app path, request
         else
-          static_file path, connection
+          static_file path, request
         end
-      when :post
-        update_app path, request.body, connection
+      when "POST"
+        update_app path, request
+      else
+        error "unknown #{request.method} request to #{request.url}"
       end
     end
 
-    def app_index(connection)
+    def app_index(request)
       json = @controller.apps.map { |app| app_as_json(app) }.to_json
-      connection.respond :ok, json
+      request.respond :ok, json
       debug "GET /apps: 200"
     end
 
-    def static_file(path, connection)
+    def static_file(path, request)
       filename = ASSET_PATH + path
       if filename.exist?
         mime_type = content_type_for filename.extname
         filename.open("r") do |file|
-          connection.respond :ok, {"Content-type" => mime_type}, file
+          request.respond :ok, {"Content-type" => mime_type}, file
         end
         debug "GET #{path}: 200"
       else
-        connection.respond :not_found, "Not found"
+        request.respond :not_found, "Not found"
         debug "GET #{path}: 404"
       end
     end
 
-    def show_app(uri, body, connection)
+    def show_app(uri, request)
       _, name, _ = uri.split("/")
       app = @controller.app name
       if app
-        connection.respond :ok, app_as_json(app).to_json
+        request.respond :ok, app_as_json(app).to_json
         debug "GET #{uri}: 200"
       else
-        connection.respond :not_found, "Not found"
+        request.respond :not_found, "Not found"
         debug "GET #{uri}: 404"
       end
     end
 
-    def update_app(uri, body, connection)
+    def update_app(uri, request)
       _, name, action = uri.split("/")
       app = @controller.app name
       if app && ACTIONS.include?(action)
         app.send action
-        connection.respond :ok, app_as_json(app).to_json
+        request.respond :ok, app_as_json(app).to_json
         debug "POST #{uri}: 200"
       else
-        connection.respond :not_found, "Not found"
+        request.respond :not_found, "Not found"
         debug "POST #{uri}: 404"
       end
     end

data/lib/ringleader/version.rb

@@ -1,3 +1,3 @@
 module Ringleader
-  VERSION = "1.1.5.pre0"
+  VERSION = "1.1.5.pre1"
 end

data/lib/ringleader/wait_for_port.rb

@@ -11,9 +11,13 @@ module Ringleader
     def wait
       begin
         TCPSocket.new @host, @port
-      rescue Errno::ECONNREFUSED
-        sleep 0.5
+      rescue Errno::ECONNREFUSED, Errno::ETIMEDOUT
         debug "#{@host}:#{@port} not open yet"
+        sleep 0.5
+        retry
+      rescue IOError, SystemCallError => e
+        error "unexpected error while waiting for port: #{e}"
+        sleep 0.5
         retry
       end
       debug "#{@host}:#{@port} open"

data/lib/ringleader.rb

@@ -21,7 +21,6 @@ require "ringleader/name_logger"
 require "ringleader/wait_for_exit"
 require "ringleader/wait_for_port"
 require "ringleader/process"
-require "ringleader/socket_proxy"
 require "ringleader/app"
 require "ringleader/app_serializer"
 require "ringleader/controller"

data/ringleader.gemspec

@@ -16,9 +16,9 @@ Gem::Specification.new do |gem|
   gem.version       = Ringleader::VERSION
   gem.required_ruby_version = "> 1.9.3"
 
-  gem.add_dependency "celluloid", "~> 0.12.4"
-  gem.add_dependency "celluloid-io", "~> 0.12.0"
-  gem.add_dependency "reel", "~> 0.1.0"
+  gem.add_dependency "celluloid", "~> 0.13.0"
+  gem.add_dependency "celluloid-io", "~> 0.13.1"
+  gem.add_dependency "reel", "~> 0.3.0"
   gem.add_dependency "trollop", "~> 1.16.2"
   gem.add_dependency "rainbow", "~> 1.1.4"
   gem.add_dependency "color", "~> 1.4.1"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ringleader
 version: !ruby/object:Gem::Version
-  version: 1.1.5.pre0
+  version: 1.1.5.pre1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.4
+        version: 0.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.4
+        version: 0.13.0
 - !ruby/object:Gem::Dependency
   name: celluloid-io
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.12.0
+        version: 0.13.1
 - !ruby/object:Gem::Dependency
   name: reel
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: trollop
   requirement: !ruby/object:Gem::Requirement
@@ -181,6 +181,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .ruby-version
 - .rvmrc
 - CHANGES.md
 - Gemfile
@@ -226,7 +227,6 @@ files:
 - lib/ringleader/name_logger.rb
 - lib/ringleader/process.rb
 - lib/ringleader/server.rb
-- lib/ringleader/socket_proxy.rb
 - lib/ringleader/version.rb
 - lib/ringleader/wait_for_exit.rb
 - lib/ringleader/wait_for_port.rb

data/lib/ringleader/socket_proxy.rb

@@ -1,42 +0,0 @@
-module Ringleader
-
-  # Proxies data to and from a server socket to a new downstream connection.
-  #
-  # This is fire-and-forget: create the SocketProxy and off it goes.
-  #
-  # Closes the server connection when proxying is complete and terminates the
-  # actor.
-  class SocketProxy
-    include Celluloid::IO
-    include Celluloid::Logger
-
-    def initialize(upstream, host, port)
-      @upstream = upstream
-
-      debug "proxying to #{host}:#{port}"
-      @socket = TCPSocket.new(host, port)
-
-      async.proxy @socket, @upstream
-      async.proxy @upstream, @socket
-
-    rescue Errno::ECONNREFUSED
-      error "could not proxy to #{host}:#{port}"
-      @upstream.close
-      terminate
-    end
-
-    def proxy(from, to)
-      ::IO.copy_stream from, to
-    rescue EOFError
-      # from or to were closed
-    rescue IOError, SystemCallError => e
-      # something else went wrong, like a connection reset or timeout: log it
-      error e
-    ensure
-      from.close unless from.closed?
-      to.close unless to.closed?
-      terminate
-    end
-  end
-
-end