envoy-proxy 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d9e12a9dc7bdb8e9ed83fd43ed0721c7c24fe93c
-  data.tar.gz: 960a0a5cb549bb9bd9c5800bdf241cb3d1c75006
+  metadata.gz: b37ea6c959f8c114427789454f1b57839190d78f
+  data.tar.gz: 5160742eaafd4c19c7dc7d5dae52ea9f778840f1
 SHA512:
-  metadata.gz: 8cc30bd5f5b6b967bef9ee9ee97635a94c489c48c3cc82642e0d8f00da73890bfb7c67ae2f1605975647c9029aab459dbaa8494b3b84dec7990249ecbd9be579
-  data.tar.gz: aafbf07d55daea5fdb3eb0e0ee98037c204e6f65f53c89ce3dbebc16ac42fc217f9ec1e7e00d4d38053881d8617b04f213f57e2b4bdc0ddf54d9b85a3d0082b6
+  metadata.gz: 7278fc984cc99dfb7761bcaf94a2a2fcef994e468ba46ea53a36976b43c5a2a57c3ad74da662cd2b0e03bf019c5dfed11f149d24e5eb19dc43056916ec9140d0
+  data.tar.gz: fa1f633ac93d12a3a72fe71f21ef9767f80aef9677f263ce839fd24da2030c0b13fdb567a5af8add464566484a424635992f81212590a226315357149af6b24b

data/README.md

@@ -42,7 +42,7 @@ connection is refused.
 
     Option         Description                                        Default
     ---------------------------------------------------------------------------
-    host           The domain name prefix                             None
+    host           The domain name prefix                             Last component of dir, or None
     local_port     The local port to use                              None
     local_host     The local host to use                              127.0.0.1
     server_host    The server host to use                             p45.eu
@@ -50,11 +50,15 @@ connection is refused.
     tls            Use TLS in the server connections                  false
     verbose        Be noisy                                           false
     command        A command to run if a local connection is refused  None
-    delay          Number of seconds to wait before reconnecting,     1
-                   after starting a command
+    delay          Number of seconds to wait for a command to start   1
     dir            A directory to change to                           None
+    rails          A directory to change to; contains a Rails app     None
+    rackup         A directory to change to; contains a Rack app      None
     log            A file to log to                                   /dev/stderr
 
+The `rails` and `rackup` options specify `dir` and `command` options for Rails
+and Rack applications, respectively.
+
 If no host is specified, a random one is selected by the server.
 If no local port is specified, a random one is selected by the client.
 The command is processed for % substitions against the configuration hash,

data/lib/envoy/client/channel.rb

@@ -12,6 +12,7 @@ module Envoy
       end
       
       def connection_completed
+        @tried_starting = nil
         send_data @buffer, true
         @buffer = nil
       end
@@ -35,15 +36,22 @@ module Envoy
       def unbind e
         if e == Errno::ECONNREFUSED
           if @tried_starting
-            @client.log "Service isn't running, but starting it didn't really work out."
-            @client.send_object :close, @id, 502
+            if Time.now > @tried_starting + @client.options[:delay]
+              @client.log "Service isn't running, but starting it didn't really work out."
+              @client.send_object :close, @id, 502
+              @tried_starting = false
+            else
+              EM.add_timer 0.1 do
+                reconnect
+              end
+            end
           elsif cmd = @client.options[:command]
             cmd = cmd % @client.options
             @client.log "Service doesn't seem to be running. Trying to start it now..."
-            @tried_starting = true
+            @tried_starting = Time.now
+            p @client.options[:dir]
             Dir.chdir File.expand_path(@client.options[:dir]) do
               fork do
-                #Process.daemon(true, false)
                 ENV.delete("GEM_HOME")
                 ENV.delete("GEM_PATH")
                 ENV.delete("BUNDLE_BIN_PATH")
@@ -51,7 +59,7 @@ module Envoy
                 system cmd
               end
             end
-            EM.add_timer @client.options[:delay] do
+            EM.add_timer 0.1 do
               reconnect
             end
           end

data/lib/envoy/client/command.rb

@@ -18,7 +18,20 @@ end
 def load_config
   if path = find_config
     conf = YAML.load(File.read(path))
-    conf.is_a?(Array) ? conf : [conf]
+    Array(conf).each do |conf|
+      if conf["rails"]
+        conf["dir"] = conf["rails"]
+        conf["pidfile"] = "tmp/pids/server.pid"
+        conf["command"] = "rails s -p %{local_port}"
+        conf["delay"] = 10
+      elsif conf["rackup"]
+        conf["dir"] = conf["rackup"]
+        conf["command"] = "rackup -p %{local_port}"
+        conf["delay"] = 10
+      end
+      conf["host"] ||= conf["dir"].split("/")[-1] if conf["dir"]
+      conf["dir"] = File.expand_path(conf["dir"], path + "/..") if conf["dir"]
+    end
   else
     [{"local_port" => "80"}]
   end

data/lib/envoy/version.rb

@@ -1,3 +1,3 @@
 module Envoy
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: envoy-proxy
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Nathan Baum
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-07 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine