envoy-proxy 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6d9b0f4972a7646dbf5c14d62a4dd6b22b38b916
-  data.tar.gz: d8d329bb6236ff90676eb4b3bd87049e76754d6b
+  metadata.gz: 3731648e8dc81bda63ae75d5bd2d7f8bb25d6ba9
+  data.tar.gz: 30cf973ba9dc29e8d155b97c0f71a0c2f324b2d4
 SHA512:
-  metadata.gz: ba994c1c737f4a6ec79b790bd899615e75a26da0322fe0189cb3ffeeaa46d0598617bfcab2f91df1cdd840ccd7fed06c17f89dddf63d9935260875def10a52ed
-  data.tar.gz: 906a1e74a93456b3c971b0c15bf398ad79b1213a01a8dd5066cd1d0f0adacdae94d6c4cd18ac52d7010faaf509200d4313d808e00906a51ee32c649263f366b0
+  metadata.gz: 219e1ab7b2e51d31baacc8b3bbad3f036bf7091cde633c67a67dc18f68abfa4209fef66a6eceb725ed0a65308067d57df06a0322c8148e3e0fe5d61f7ac43090
+  data.tar.gz: 4444bfa29c6e3a56e238c49cd7a377e7d34b25c8e3f9f3b2bd0728e1c6dec0c5e15e6808ddaa282029f7a55b59f7b6be8f65210f84b55f596234a242f99c2a12

data/lib/envoy/client/command.rb

@@ -35,6 +35,10 @@ OptionParser.new do |op|
     puts op
     exit
   end
+  op.on "--version" do
+    puts Envoy::VERSION
+    exit
+  end
   op.parse!
   case ARGV[0]
   when /^(\d+)$/
@@ -51,4 +55,4 @@ unless EM.reactor_running?
   EM.run do
     Envoy::Client::Trunk.start options
   end
-end
+end

data/lib/envoy/client/trunk.rb

@@ -53,9 +53,9 @@ module Envoy
       
       def unbind
         if r = @options[:reconnect]
-          STDERR.puts "Lost connection. Reconnecting in #{r[0]}s."
-          EM.add_timer r[0] do
-            @options[:reconnect] = [r[1], r[0] + r[1]]
+          STDERR.write "Lost connection. Retrying... #{r[0]}\r"
+          EM.add_timer 0.5 do
+            @options[:reconnect] = r.rotate
             Trunk.start @options
           end
         else
@@ -70,7 +70,7 @@ module Envoy
       
       def ssl_handshake_completed
         options[:did_connect] = true
-        options[:reconnect] = [0, 1] if options[:hosts]
+        options[:reconnect] = %w"- \\ | /" if options[:hosts]
         o = options.dup
         o.delete(:local_host)
         send_object :options, o

data/lib/envoy/server/command.rb

@@ -10,6 +10,10 @@ OptionParser.new do |op|
     port, host = v.split(":").reverse
     listen = [host || "0.0.0", port]
   end
+  op.on "--version" do
+    puts Envoy::VERSION
+    exit
+  end
   op.parse!
   op.abort "zone required" unless ARGV[0]
 end

data/lib/envoy/server/web.rb

@@ -19,7 +19,7 @@ module Envoy
         @first_line ||= line
         if line == ""
           trunk = Trunk.trunks[@host].sample || raise("No trunk for #{@host}.#{$zone}")
-          @header << "Connection: #{@connection}\r\n"
+          @header << "Connection: #{@connection}\r\n\r\n"
           @channel = Channel.new(trunk, self, @header)
           @channel.message "%s %s" % [Socket.unpack_sockaddr_in(get_peername)[1], @first_line]
           set_text_mode
@@ -28,9 +28,9 @@ module Envoy
         elsif line =~ /^keep-alive:/i
         elsif line =~ /^host:\s*([^:]*)/i
           @host = $1
+          raise "Request for #{@host} is not in #{$zone}" unless @host.end_with?($zone)
           @host = @host[0...-$zone.length]
           @host = @host.split(".").last
-          raise "Request is not in #{$zone}" unless @host.end_with?($zone)
           @header << line + "\r\n"
         elsif @header.size > 4096
           raise "Header's too long for my liking"

data/lib/envoy/version.rb

@@ -1,5 +1,3 @@
-
 module Envoy
-  VERSION = '0.0.9'
-end
-
+  VERSION = '0.0.10'
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: envoy-proxy
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Nathan Baum