envoy-proxy 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1ceea987c2f42d998c32945dea4d25f6c571db0d
-  data.tar.gz: 4d79c5986ad8af9578b95b00d5af917b6e04bf87
+  metadata.gz: 7644ebca255c042dfc7547f19bdc2eea334aedba
+  data.tar.gz: fcbd5085dd22d98ba09bcd78ab42ff4aa3fb9871
 SHA512:
-  metadata.gz: 49e207baec76b7e7337a4523415a890e8ff0a9ba794bc85ac13ffa4f832b23a3c0b2999827206a82d033c1fa42f29e3bcc0b93de3a246cf5f211414a9aa7b005
-  data.tar.gz: 3f1db159171267008e2a2572aae30d0e0766c547377da9153a283a1fbfb7c3258a21d098d03550dc45188d830ee93b68c19a095867c59c2cbf51bac1d33ef2e4
+  metadata.gz: 96a448f58f4fc00987428d5456af0bbb0e974a1fc5958050acb1081c01dd44a93ec1fdee189d7909f222f9eaab70b77b72ba6b88b6129522dd9680adeae7861f
+  data.tar.gz: 631fdb2c113848702e123b41f1d50429a789ad90e9c33b071829c6d88258c1adf547197a5fb814b60c88a0b29ca755db7b8dae5028c10ad4430e08517edb20e0

data/README.md

@@ -6,7 +6,7 @@ A clone of proxylocal. Both client and server are included.
 
 ## The client
 
-    envoy [--key KEY] [--host HOST] [--tls] [--server SERVER] [[ADDRESS:]PORT] 
+    envoy [--key KEY] [--host HOST] [--tls] [--server SERVER] [--log FILE] [[ADDRESS:]PORT] 
 
 Makes the HTTP* service running at ADDRESS:PORT available via a proxylocal
 service running on SERVER. The default server is p45.eu, and the default address
@@ -53,6 +53,7 @@ connection is refused.
     delay          Number of seconds to wait before reconnecting,     1
                    after starting a command
     dir            A directory to change to                           None
+    log            A file to log to                                   /dev/stderr
 
 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.

data/lib/envoy/client/command.rb

@@ -20,7 +20,7 @@ def load_config
     conf = YAML.load(File.read(path))
     conf.is_a?(Array) ? conf : [conf]
   else
-    [{}]
+    [{"local_port" => "80"}]
   end
 end
 
@@ -29,8 +29,8 @@ options = parse_options
 unless EM.reactor_running?
   EM.run do
     load_config.each do |config|
-      config["local_port"] ||= rand(16383) + 49152
       config = options.merge(config)
+      config["local_port"] ||= rand(16383) + 49152
       config["hosts"] ||= [config.delete("host")] if config["host"]
       config = config.each_with_object({}) do |(k, v), h|
         h[k.to_sym] = v
@@ -38,5 +38,4 @@ unless EM.reactor_running?
       Envoy::Client::Trunk.start config
     end
   end
-end
-
+end

data/lib/envoy/client/option_parser.rb

@@ -35,6 +35,12 @@ def parse_options
     op.on "-v", "--[no-]verbose", "Be noisy about what's happening" do |v|
       options["verbose"] = v
     end
+    op.on "--no-log", "Don't show HTTP log" do |v|
+      options["log"] = false
+    end
+    op.on "l", "--log FILE", "Write HTTP log to this file" do |v|
+      options["log"] = v
+    end
     op.on "-h", "--help", "Show this message" do
       puts op
       exit

data/lib/envoy/client/trunk.rb

@@ -15,6 +15,10 @@ module Envoy
       
       def initialize options
         @options = options
+        @log = STDERR
+        if @options.has_key?(:log)
+          @log = @options[:log] && File.open(@options[:log], "a")
+        end
       end
       
       def channels
@@ -42,9 +46,11 @@ module Envoy
       def receive_keepalive
       end
       
-      def log message
+      def log message, io = @log
+        return unless io
         t = Time.now.strftime("%F %T")
-        STDERR.puts t + " " + message.split("\n").join("\n#{t.gsub(/./, ' ')} ")
+        io.puts t + " " + message.split("\n").join("\n#{t.gsub(/./, ' ')} ")
+        io.flush
       end
       
       def receive_message message

data/lib/envoy/protocol.rb

@@ -30,4 +30,3 @@ module Envoy
   end
 
 end
-

data/lib/envoy/server/trunk.rb

@@ -5,6 +5,11 @@ 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

data/lib/envoy/version.rb

@@ -1,6 +1,3 @@
 module Envoy
-  VERSION = '0.1.1'
-  def version
-    VERSION.split(".")
-  end
+  VERSION = '0.1.2'
 end

metadata

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