ringleader 0.0.1 → 0.0.2

data/README.md

@@ -61,9 +61,11 @@ main_app:
   # the port ringleader listens on
   server_port: 3000
   # the port the application listens on
-  port: 4000
-  # idle timeout in seconds, defaults to 0. 0 means "never".
+  app_port: 4000
+  # idle timeout in seconds
   idle_timeout: 6000
+  # application startup timeout
+  startup_timeout: 180
 other_app:
   [...]
 ```

data/lib/ringleader/app.rb

@@ -54,6 +54,7 @@ module Ringleader
       return unless @pid
 
       info "stopping `#{config.command}`"
+      @master.close unless @master.closed?
       Process.kill "SIGHUP", -@pid
 
       timer = after 30 do
@@ -71,7 +72,7 @@ module Ringleader
 
     # Internal: callback for when the application port has opened
     def port_opened
-      info "listening on #{config.hostname}:#{config.port}"
+      info "listening on #{config.hostname}:#{config.app_port}"
       signal :running, true
     end
 
@@ -96,26 +97,25 @@ module Ringleader
       @starting = true
       info "starting process `#{config.command}`"
 
-      # need a pipe for input, even if we don't use it
-      stdin, stdout = ::IO.pipe
-      # give the child process a terminal
-      master, slave = PTY.open
+      # give the child process a terminal so output isn't buffered
+      @master, slave = PTY.open
       @pid = Process.spawn %Q(bash -c "#{config.command}"),
-        :in => stdin,
+        :in => slave,
         :out => slave,
         :err => slave,
-        :pgroup => true,
-        :chdir => config.dir
-      stdin.close
-      stdout.close
+        :chdir => config.dir,
+        :pgroup => true
       slave.close
-      proxy_output master
+      proxy_output @master
       debug "started with pid #{@pid}"
 
       @wait_for_exit = WaitForExit.new @pid, Actor.current
-      @wait_for_port = WaitForPort.new config.hostname, config.port, Actor.current
+      @wait_for_port = WaitForPort.new config.hostname, config.app_port, Actor.current
 
-      timer = after(30) { warn "application startup took too long"; stop! }
+      timer = after config.startup_timeout do
+        warn "application startup took more than #{config.startup_timeout}"
+        stop!
+      end
 
       @running = wait :running
       @starting = false

data/lib/ringleader/app_proxy.rb

@@ -45,7 +45,7 @@ module Ringleader
     end
 
     def proxy_to_app(socket)
-      SocketProxy.new socket, config.hostname, config.port
+      SocketProxy.new socket, config.hostname, config.app_port
     end
 
     def start_activity_timer

data/lib/ringleader/cli.rb

@@ -54,6 +54,7 @@ module Ringleader
         app
       end
 
+      # gracefully die instead of showing an interrupted sleep below
       trap("INT") do
         info "shutting down..."
         apps.each { |app| app.stop! }
@@ -118,9 +119,11 @@ something like this:
       # the port ringleader listens on
       server_port: 3000
       # the port the application listens on
-      port: 4000
-      # idle timeout in seconds, defaults to 0. 0 means "never".
+      app_port: 4000
+      # idle timeout in seconds, defaults to #{Config::DEFAULT_IDLE_TIMEOUT}. 0 means "never".
       idle_timeout: 6000
+      # application startup timeout, defaults to #{Config::DEFAULT_STARTUP_TIMEOUT}.
+      startup_timeout: 180
     other_app:
       [...]
 

data/lib/ringleader/config.rb

@@ -1,9 +1,10 @@
 module Ringleader
   class Config
 
-    DEFAULT_IDLE_TIMEOUT = 0
+    DEFAULT_IDLE_TIMEOUT = 1800
+    DEFAULT_STARTUP_TIMEOUT = 30
     DEFAULT_HOSTNAME = "127.0.0.1"
-    REQUIRED_KEYS = %w(dir command server_port port idle_timeout)
+    REQUIRED_KEYS = %w(dir command server_port app_port idle_timeout)
 
     def initialize(file)
       @config = YAML.load(File.read(file))
@@ -15,6 +16,7 @@ module Ringleader
           options["name"] = name
           options["hostname"] ||= DEFAULT_HOSTNAME
           options["idle_timeout"] ||= DEFAULT_IDLE_TIMEOUT
+          options["startup_timeout"] ||= DEFAULT_STARTUP_TIMEOUT
           validate name, options
           [name, OpenStruct.new(options)]
         end

data/lib/ringleader/version.rb

@@ -1,3 +1,3 @@
 module Ringleader
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/fixtures/config.yml

@@ -4,15 +4,15 @@ main_site:
   command: "bundle exec foreman start"
   hostname: "0.0.0.0"
   server_port: 3000
-  port: 4000
+  app_port: 4000
   idle_timeout: 1800
 admin:
   dir: "~/apps/admin"
   command: "bundle exec foreman start"
   server_port: 3001
-  port: 4001
+  app_port: 4001
 authentication:
   dir: "~/apps/auth"
   command: "bundle exec foreman start"
   server_port: 3002
-  port: 4002
+  app_port: 4002

data/spec/fixtures/invalid.yml

@@ -2,4 +2,4 @@
 main_site:
   dir: "~/apps/main"
   server_port: 3000
-  port: 4000
+  app_port: 4000

data/spec/ringleader/config_spec.rb

@@ -20,7 +20,11 @@ describe Ringleader::Config do
       end
 
       it "includes a default idle timeout" do
-        expect(subject.apps["admin"].idle_timeout).to eq(0)
+        expect(subject.apps["admin"].idle_timeout).to eq(Ringleader::Config::DEFAULT_IDLE_TIMEOUT)
+      end
+
+      it "sets a default start timeout" do
+        expect(subject.apps["admin"].startup_timeout).to eq(Ringleader::Config::DEFAULT_STARTUP_TIMEOUT)
       end
 
       it "sets the config name to match the key in the config file" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ringleader
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-17 00:00:00.000000000 Z
+date: 2012-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: celluloid