zebra 1.0.0 → 1.0.1

data/README

@@ -0,0 +1,13 @@
+Usage:
+
+# First start the queue
+zebra --config contrib/config.yml queue
+
+# Then start the workers
+zebra --config contrib/config.yml worker
+
+# Then start the proxy server
+zebra --config contrib/config.yml server
+
+# For more arguments, check out:
+zebra --help

data/contrib/config.yml

@@ -1 +1,12 @@
 #log_file: "/tmp/zebra.log"
+server:
+  port: 8000
+  chdir: "/tmp"
+  frontend_uri: 'tcp://localhost:5600'
+queue:
+  frontend_uri: 'tcp://*:5600'
+  backend_uri: 'tcp://*:5601'
+worker:
+  timeout: 3600
+  workers: 10
+  backend_uri: 'tcp://localhost:5601'

data/lib/zebra/command_line.rb

@@ -39,16 +39,15 @@ module Zebra
         Zebra.config.mode = ARGV.shift if ARGV.length > 0
         raise MissingArgumentException.new("Missing --config parameter") unless Zebra.config.config_file?
         raise MissingArgumentException.new("Missing mode of operation: server|proxy|queue") unless Zebra.config.mode?
+      rescue SystemExit 
+        exit(1)
       rescue MissingArgumentException => e
         puts usage(e)
-        exit 1
       rescue ArgumentError => e
         puts usage(e)
-        exit 1
       rescue Exception => e
-        puts e.message
+        puts "#{e.class}: #{e.message}"
         puts e.backtrace.join("\n\t")
-        exit 1
       end
     end
 

data/lib/zebra/proxy_server.rb

@@ -16,7 +16,7 @@ module Zebra
       config[:context] = EM::ZeroMQ::Context.new(1)
       config[:connection_pool] = EM::Synchrony::ConnectionPool.new(:size => 20) do  
         config[:context].socket(ZMQ::REQ) do |socket|
-          socket.connect("tcp://localhost:5559")
+          socket.connect(Zebra.config.server[:frontend_uri])
         end
       end
     end

data/lib/zebra/proxy_worker.rb

@@ -27,8 +27,7 @@ module Zebra
       raw_headers
     end
 
-    def get_conn(url)
-      uri = URI.parse(url)
+    def get_conn(uri)
       conn_key = uri.scheme + '://' + uri.host
       return EM::HttpRequest.new(conn_key, :connect_timeout => 1, :inactivity_timeout => 1)
       if @conns.has_key?(conn_key)
@@ -38,12 +37,11 @@ module Zebra
       end
     end
 
-    def fetch(method, url, request_headers = {})
+    def fetch(method, uri, request_headers = {})
       @response = nil
-      @logger.debug "Proxying #{method} #{url} #{request_headers.inspect}"
+      @logger.debug "Proxying #{method} #{uri} #{request_headers.inspect}"
       t_start = Time.now
-      uri = URI.parse(url)
-      conn = get_conn(url)
+      conn = get_conn(uri)
       request_headers['Host'] = uri.host
       http = conn.send(method, path: uri.path, query: uri.query, head: request_headers, :keepalive => true)
       @logger.debug "Request finished"
@@ -67,10 +65,15 @@ module Zebra
     def handle_message(m)
       #ap m.copy_out_string
       env = JSON.parse(m.copy_out_string)
-      #url = 'http://' + env['HTTP_HOST'] + env['REQUEST_URI']
-      url = env['REQUEST_URI'] 
+      uri = URI.parse(env['REQUEST_URI'])
+      uri.host = env['HTTP_HOST'] if uri.host.nil? || uri.host.empty?
+      uri.path = '/' if uri.path.nil? || uri.path.empty?
+      puts env.inspect
+      uri.scheme = env['HTTP_X_FORWARDED_PROTO'].downcase if env.has_key?('HTTP_X_FORWARDED_PROTO')
+      uri.scheme = 'http' if uri.scheme.nil? || uri.scheme.empty?
       method = env['REQUEST_METHOD'].downcase.to_sym
-      fetch(method, url)
+      puts "uri: #{uri.to_s}"
+      fetch(method, uri)
     end
 
     def on_readable(socket, messages)
@@ -100,6 +103,9 @@ module Zebra
                  :app_name => @app_name,
                  :logger => @log,
                  :timeout => @timeout }
+      params[:stdout_path] = Zebra.config.log_file if Zebra.config.log_file?
+      params[:stderr_path] = Zebra.config.log_file if Zebra.config.log_file?
+
       workers = Preforker.new(params) do |master|
         config = {:logger => @log}
         handler = ProxyWorkerReceiveMessageHandler.new(config)
@@ -114,7 +120,7 @@ module Zebra
             context = EM::ZeroMQ::Context.new(1)
           #  connection_pool = EM::Synchrony::ConnectionPool.new(:size => 1) do  
               socket = context.socket(ZMQ::REP, handler)
-              socket.connect('tcp://localhost:5560')
+              socket.connect(Zebra.config.worker[:backend_uri])
           #  end
           end
         end

data/lib/zebra/queue.rb

@@ -5,8 +5,8 @@ module Zebra
     attr_accessor :context, :frontend, :backend, :poller, :log, :frontend_uri, :backend_uri
     def initialize(config)
       @log = config[:logger] || Logger.new(STDERR)
-      @frontend_uri = config[:frontend] || 'tcp://*:5559'
-      @backend_uri = config[:backend] || 'tcp://*:5560'
+      @frontend_uri = config[:frontend_uri] || 'tcp://*:5559'
+      @backend_uri = config[:backend_uri] || 'tcp://*:5560'
       @context = ZMQ::Context.new
 
       # Socket facing clients

data/lib/zebra/version.rb

@@ -1,3 +1,3 @@
 module Zebra
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/zebra.gemspec

@@ -8,8 +8,8 @@ Gem::Specification.new do |s|
   s.authors     = ["osterman"]
   s.email       = ["e@osterman.com"]
   s.homepage    = "https://github.com/osterman/zebra"
-  s.summary     = %q{A Goliath ZMQ Reverse HTTP Proxy Implementation}
-  s.description = %q{A proxy that uses ZMQ as the wire protocol between HTTP proxy gateway and backend worker nodes. This allows for each load distribution to worker nodes behind a firewall.}
+  s.summary     = %q{A Goliath Reverse HTTP Proxy Implementation Using ZMQ}
+  s.description = %q{Zebra is a HTTP proxy server that uses ZMQ as the wire protocol between HTTP proxy gateway(s) and backend worker node(s). This allows for seamless load distribution to worker nodes behind a firewall.}
 
   s.rubyforge_project = "zebra"
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: zebra
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - osterman
@@ -192,7 +192,7 @@ dependencies:
         version: 1.1.0
   type: :runtime
   version_requirements: *id011
-description: A proxy that uses ZMQ as the wire protocol between HTTP proxy gateway and backend worker nodes. This allows for each load distribution to worker nodes behind a firewall.
+description: Zebra is a HTTP proxy server that uses ZMQ as the wire protocol between HTTP proxy gateway(s) and backend worker node(s). This allows for seamless load distribution to worker nodes behind a firewall.
 email: 
 - e@osterman.com
 executables: 
@@ -204,6 +204,7 @@ extra_rdoc_files: []
 files: 
 - .gitignore
 - Gemfile
+- README
 - Rakefile
 - bin/zebra
 - contrib/config.yml
@@ -249,6 +250,6 @@ rubyforge_project: zebra
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: A Goliath ZMQ Reverse HTTP Proxy Implementation
+summary: A Goliath Reverse HTTP Proxy Implementation Using ZMQ
 test_files: []