envoy-proxy 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ed79185e2aad87adb4349b67cc291736ba715e0
-  data.tar.gz: b4c8f976611a606f40cc4cad0b4242f0e1f8b3ee
+  metadata.gz: 20acae48638da1f09581622a10b1b742b50828d9
+  data.tar.gz: 0238fa0dea61a626f1e262c70e705cd421f2ef14
 SHA512:
-  metadata.gz: c0041100f109dbee5cfd0d33a5eb8bffd88acda65fa810bba1c8f3ac1c184d5bcbbae50bc6bf9f535bd9ac9485a4a1a9f28b3e0a886f5b2dced6944aef5bb622
-  data.tar.gz: d9a0a9017b0dc3457385c9717db2ff3acf72c549cfc76a23eb43b7e8caeca06af98b8ac67ea94b07c139b47ef3379e7e5d48e832c2b27fd8e19348c5e1ab7394
+  metadata.gz: 4e24a4507489bdc66f20798b9eeb69a662b3a0856a3cb2eddd0a2004d6d08cc7aa6fa2acb6bb11c404a7c29daf3151e62e443a1d93acbddd1694cbb420479247
+  data.tar.gz: a401d0c2b88a85e1a7b1a63a3ba5881b67be7f53bdfffbf0a9044fea06a820a4288558d5fa67a18ecbe160b7cb58443349777991a8fc10a130e0f1eebdab3767

data/envoy-proxy.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |spec|
   
   spec.add_dependency('eventmachine', '~> 1.0')
   spec.add_dependency('bert', '~> 1.1')
+  spec.add_dependency('colorize', '~> 0.7.3')
   
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"

data/lib/envoy/client/channel.rb

@@ -12,6 +12,7 @@ module Envoy
       end
       
       def connection_completed
+        @client.log TRACE, "connected to upstream service for stream #{@id}"
         @tried_starting = nil
         send_data @buffer, true
         @buffer = nil
@@ -26,18 +27,21 @@ module Envoy
       end
       
       def receive_data data
+        @client.log TRACE, "#{data.length} bytes of data send on stream #{@id}"
         @client.send_object :stream, @id, data
       end
       
       def reconnect
+        @client.log TRACE, "reconnecting to upstream service for stream #{@id}"
         super @client.options[:local_host], @client.options[:local_port]
       end
       
       def unbind e
         if e == Errno::ECONNREFUSED
+          @client.log TRACE, "couldn't connect to upstream service for stream #{@id}"
           if @tried_starting
             if Time.now > @tried_starting + @client.options[:delay]
-              @client.log "Service isn't running, but starting it didn't really work out."
+              @client.log ERROR, "Service isn't running, but starting it didn't really work out."
               @client.send_object :close, @id, 502
               @tried_starting = false
             else
@@ -47,7 +51,7 @@ module Envoy
             end
           elsif cmd = @client.options[:command]
             cmd = cmd % @client.options
-            @client.log "Service doesn't seem to be running. Trying to start it now..."
+            @client.log INFO, "Service doesn't seem to be running. Trying to start it now..."
             @tried_starting = Time.now
             p @client.options[:dir]
             Dir.chdir File.expand_path(@client.options[:dir]) do
@@ -64,8 +68,9 @@ module Envoy
             end
           end
         elsif e
-          @client.log e.inspect
+          @client.log ERROR, e.inspect
         else
+          @client.log TRACE, "upstream service closed stream #{@id}"
           @client.send_object :close, @id
         end
       end

data/lib/envoy/client/command.rb

@@ -41,6 +41,14 @@ options = parse_options
 
 unless EM.reactor_running?
   EM.run do
+    Signal.trap("INT") do
+      $exiting = true
+      EventMachine.stop
+    end
+    Signal.trap("TERM") do
+      $exiting = true
+      EventMachine.stop
+    end
     load_config.each do |config|
       config = config.merge(options)
       config["local_port"] ||= config["command"] ? rand(16383) + 49152 : 80

data/lib/envoy/client/option_parser.rb

@@ -6,10 +6,13 @@ def default_options
     "server_port" => "8282",
     "local_host" => '127.0.0.1',
     "tls" => false,
-    "verbose" => false,
+    "verbosity" => 3,
     "version" => Envoy::VERSION,
     "delay" => 1,
-    "dir" => "."
+    "dir" => ".",
+    "timestamps" => false,
+    "show_log_level" => true,
+    "color_log_level" => true,
   }
 end
 
@@ -32,6 +35,12 @@ def parse_options
     op.on "-c COMMAND", "Run this command" do |v|
       options["command"] = v
     end
+    op.on "-v", "--verbose", "Show messages. Repeat to show more." do
+      options["verbosity"] += 1
+    end
+    op.on "-q", "--quiet", "Hide messages. Repeat to hide more." do
+      options["verbosity"] -= 1
+    end
     op.on "-h", "--help", "Show this message" do
       puts op
       exit

data/lib/envoy/client/trunk.rb

@@ -1,5 +1,6 @@
 require 'envoy/protocol'
 require 'envoy/client/channel'
+require 'colorize'
 
 module Envoy
   module Client
@@ -19,6 +20,7 @@ module Envoy
         if @options.has_key?(:log)
           @log = @options[:log] && File.open(@options[:log], "a")
         end
+        log DEBUG, "envoy #{Envoy::VERSION} starting up"
       end
       
       def channels
@@ -26,19 +28,23 @@ module Envoy
       end
       
       def receive_start_tls
+        log DEBUG, "Securing channel."
         start_tls
       end
       
       def receive_close id
+        log TRACE, "closed stream #{id}"
         channels[id].close_connection true
         channels.delete(id)
       end
       
       def receive_stream id, data
+        log TRACE, "#{data.length} bytes of data received on stream #{id}"
         channels[id].send_data data
       end
       
       def receive_connection id
+        log TRACE, "New connection request with id `#{id}'"
         channels[id] = EM.connect(options[:local_host] || '127.0.0.1',
                                   options[:local_port], Channel, id, self)
       end
@@ -46,18 +52,28 @@ module Envoy
       def receive_keepalive
       end
       
-      def log message, io = @log
+      def log (level, text, io = @log)
         return unless io
-        t = Time.now.strftime("%F %T")
-        io.puts t + " " + message.split("\n").join("\n#{t.gsub(/./, ' ')} ")
+        return unless level <= verbosity
+        message = [
+          @options[:timestamps] ? Time.now.strftime("%F %T") : nil,
+          @options[:show_log_level] ? "#{VERBOSITIES[level][0]}:" : nil,
+          text
+        ].compact.join(" ")
+        if @options[:color_log_level]
+          #FATAL ERROR WARN\  INFO\  DEBUG TRACE
+          message = message.colorize(%i"red red yellow green default light_black"[level])
+        end 
+        io.puts message
         io.flush
       end
       
-      def receive_message message
-        log message
+      def receive_message text, level = INFO
+        log level, text
       end
       
       def receive_ping
+        log TRACE, "Server pinged. Ponging back."
         send_object :pong
       end
       
@@ -66,33 +82,42 @@ module Envoy
         EventMachine.stop_event_loop
       end
       
+      def receive_confirm (options)
+        log DEBUG, "Server confirmed our request. Proxy set up."
+      end
+      
       def unbind
         if @halting
-          STDERR.puts "Server shut us down."
+          log DEBUG, "Shutting down because server told us to."
+        elsif $exiting
+          log DEBUG, "Shutting down because the local system told us to."
         elsif !@halting && r = @options[:reconnect]
-          STDERR.write "Lost connection. Retrying... #{r[0]}\r"
+          log WARN, "Lost connection. Retrying..." if r == 0
           EM.add_timer 0.5 do
-            @options[:reconnect] = r.rotate
+            @options[:reconnect] += 1
             Trunk.start @options
           end
         else
           if options[:did_connect]
-            STDERR.puts "Connection lost. Not point reconnecting because the host is randomly generated."
+            log FATAL, "Connection lost. Not point reconnecting because the host is randomly generated."
           else
-            STDERR.puts "Couldn't connect. Abandoning ship."
+            log FATAL, "Couldn't connect. Abandoning ship."
           end
           EventMachine.stop_event_loop
         end
       end
       
       def ssl_handshake_completed
+        log DEBUG, "Channel is secure, sending options"
         options[:did_connect] = true
-        options[:reconnect] = %w"- \\ | /" if options[:hosts]
+        options[:reconnect] = 0 if options[:hosts]
         send_object :options, options
+        log DEBUG, "Exporting #{@options[:local_host]}:#{@options[:local_port]}"
       end
       
       def post_init
         self.comm_inactivity_timeout = 25
+        log DEBUG, "Requesting TLS negotiation."
         send_object :start_tls
       end
       

data/lib/envoy/protocol.rb

@@ -1,11 +1,24 @@
 require 'eventmachine'
 require 'bert'
 
+TRACE = 5
+DEBUG = 4
+INFO  = 3
+WARN  = 2
+ERROR = 1
+FATAL = 0
+
 module Envoy
 
   module Protocol
     include EM::P::ObjectProtocol
     
+    VERBOSITIES = %w"FATAL ERROR WARN\  INFO\  DEBUG TRACE"
+    
+    def verbosity
+      @verbosity ||= [FATAL, [TRACE, @options[:verbosity] || 3].min].max
+    end
+      
     module Serializer
       def self.dump(object)
         BERT.encode(object)

data/lib/envoy/server/trunk.rb

@@ -5,11 +5,6 @@ module Envoy
     module Trunk
       include Protocol
       
-      def log message
-        t = Time.now.strftime("%F %T")
-        STDERR.puts t + " " + message.split("\n").join("\n#{t.gsub(/./, ' ')} ")
-      end
-      
       def initialize key
         super
         @key = key
@@ -33,7 +28,6 @@ module Envoy
       
       def receive_pong
         EM.add_timer 5 do
-          log "ping"
           send_object :ping
         end
       end
@@ -60,8 +54,21 @@ module Envoy
         @options[:key]
       end
       
+      def log message
+        t = Time.now.strftime("%F %T")
+        STDERR.puts t + " " + message.split("\n").join("\n#{t.gsub(/./, ' ')} ")
+      end
+      
+      def message (level, message)
+        if @options[:verbosity]
+          send_object :message, message, level
+        else
+          send_object :message, message
+        end
+      end
+      
       def halt message = nil
-        send_object :message, message if message
+        message FATAL, message if message
         send_object :halt
         close_connection(true)
       end
@@ -72,13 +79,11 @@ module Envoy
       
       def receive_options options
         @options = options
-        if version? "~> 0.1"
-          receive_pong
-        end
+        receive_pong if version? "> 0.1"
         if version? "< #{Envoy::VERSION}"
-          send_object :message, "Your client is out of date. Please upgrade to #{Envoy::VERSION}."
+          message WARN, "Your client is out of date. Please upgrade to #{Envoy::VERSION}."
         elsif version? "> #{Envoy::VERSION}"
-          send_object :message, "Your client is from the future. The server is expecting #{Envoy::VERSION}."
+          message WARN, "Your client is from the future. The server is expecting #{Envoy::VERSION}."
         end
         if @key and @key != @options[:key]
           halt "Key is invalid"
@@ -87,28 +92,32 @@ module Envoy
         hosts = @options[:hosts] || []
         hosts.any? do |label|
           if label == "s"
-            send_object :message, "label is reserved: `#{label}'"
+            message FATAL, "label is reserved: `#{label}'"
             true
           elsif label =~ /\./
-            send_object :message, "label is invalid: `#{label}'"
+            message FATAL, "label is invalid: `#{label}'"
             true
           elsif other_trunk = Trunk.trunks[label][0]
             unless other_trunk.key == key
-              send_object :message, "label is protected with a key: `#{label}'"
+              message FATAL, "label is protected with a key: `#{label}'"
               true
             end
           end
         end && halt
-        hosts << SecureRandom.random_number(36 ** 4).to_s(36) if hosts.empty?
-        m = ["#{options[:local_host]}:#{options[:local_port]} now available at:"]
-        @hosts = hosts.each do |host|
-          Trunk.trunks[host] << self
-          send_object :message, "host: #{host}.#{$zone}"
+        if hosts.empty?
+          hosts = [SecureRandom.random_number(36 ** 4).to_s(36)]
+          message INFO, "Service accessible at http://#{hosts[0]}.#{$zone}/"
+        else
+          @hosts = hosts.each do |host|
+            Trunk.trunks[host] << self
+            message INFO, "Service accessible at http://#{host}.#{$zone}/"
+          end
         end
         unless @options[:key]
-          @options[:key] ||= SecureRandom.hex(8)
-          send_object :message, "key: #{@options[:key]}"
+          @options[:key] = SecureRandom.hex(8)
+          message INFO, "Service access key is `#{@options[:key]}'"
         end
+        send_object :confirm, @options if version? ">= 0.2.2"
       end
       
       def unbind

data/lib/envoy/version.rb

@@ -1,3 +1,3 @@
 module Envoy
-  VERSION = '0.2.0'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: envoy-proxy
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Nathan Baum
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement