yup 0.1.0 → 0.1.1

data/Gemfile

@@ -8,11 +8,11 @@ gem "yajl-ruby"
 
 group :development do
   gem "bdb"
-  gem "yard",      "~> 0.6.0"
-  gem "minitest",  ">= 0"
-  gem "bundler",   "~> 1.0"
+  gem "yard",      "~> 0.8.0"
+  gem "minitest"
+  gem "bundler",   "~> 1.2"
   gem "jeweler",   "~> 1.8.4"
-  gem "simplecov", ">= 0"
-  gem "simplecov-rcov", ">= 0"
+  gem "simplecov"
+  gem "simplecov-rcov"
   gem "travis-lint"
 end

data/Gemfile.lock

@@ -38,14 +38,14 @@ GEM
       hashr (>= 0.0.19)
     tuple (0.1.2)
     yajl-ruby (1.1.0)
-    yard (0.6.8)
+    yard (0.8.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bdb
-  bundler (~> 1.0)
+  bundler (~> 1.2)
   em-http-request
   eventmachine
   http_parser.rb
@@ -56,4 +56,4 @@ DEPENDENCIES
   travis-lint
   tuple
   yajl-ruby
-  yard (~> 0.6.0)
+  yard (~> 0.8.0)

data/README.rdoc

@@ -1,6 +1,7 @@
 = yup daemon
 
 {<img src="https://secure.travis-ci.org/neglectedvalue/yup.png" alt="Build Status" />}[http://travis-ci.org/neglectedvalue/yup]
+{<img src="https://gemnasium.com/neglectedvalue/yup.png" alt="Dependency Status" />}[https://gemnasium.com/neglectedvalue/yup]
 {<img src="https://codeclimate.com/badge.png" />}[https://codeclimate.com/github/neglectedvalue/yup]
 
 This is the small daemon to forward HTTP requests when response is known or unimportant.

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bin/yupd

@@ -22,6 +22,7 @@ Options:
                              Available log levels: fatal, error, warn, info, debug.
   --persistent <path>        Use persistent queue.
   --timeout <seconds>        Timeout for answer from FORWARD_TO_HOST (default 60.0)
+  --retry-unless-2xx         Retry even if status code not 2xx.
 
 Examples:
   yupd --listen 0.0.0.0:8081 --status-code 201 errbit.host.somewhere
@@ -45,6 +46,7 @@ opts = GetoptLong.new(*[['--help',         '-h', GetoptLong::NO_ARGUMENT],
                         ['--loglevel',           GetoptLong::REQUIRED_ARGUMENT],
                         ['--persistent',         GetoptLong::REQUIRED_ARGUMENT],
                         ['--timeout',            GetoptLong::REQUIRED_ARGUMENT],
+                        ['--retry-unless-2xx',   GetoptLong::NO_ARGUMENT],
                         ])
 config = {:loglevel => LEVELS["fatal"]}
 
@@ -73,6 +75,8 @@ opts.each do |opt, arg|
     config[:persistent] = arg || "/tmp/queue"
   when '--timeout'
     config[:timeout] = arg.to_f
+  when '--retry-unless-2xx'
+    config[:retry_unless_2xx] = true
   end
 end
 
@@ -87,6 +91,7 @@ config[:forward_to] = ARGV.shift
 Yup.logger.level = config[:loglevel]
 Yup.watermark    = config[:watermark] if config.has_key?(:watermark)
 Yup.resend_delay = config[:resend_delay] if config.has_key?(:resend_delay)
+Yup.retry_unless_2xx = config[:retry_unless_2xx] if config.has_key?(:retry_unless_2xx)
 
 if config.has_key?(:persistent)
   Yup.run_with_state(config)

data/lib/yup.rb

@@ -21,6 +21,10 @@ module Yup
   def self.logger; @@logger end
   def self.logger=(logger); @@logger = logger end
 
+  @@retry_unless_2xx = false
+  def self.retry_unless_2xx; @@retry_unless_2xx end
+  def self.retry_unless_2xx=(bool); @@retry_unless_2xx = bool end
+
   def self.run(config)
     host = config[:listen_host] || 'localhost'
     port = config[:listen_port] || 8080

data/lib/yup/request_forwarder.rb

@@ -26,7 +26,7 @@ module Yup
              :head => @headers,
              :body => @body)
 
-      @logger.progname = "Yup::RequestForwarder (##{http.__id__.to_s(36)} received at #{Time.now.to_s})"
+      @logger.progname = "Yup::RequestForwarder (##{self.__id__.to_s(36)} received at #{Time.now.to_s})"
 
       http.callback do
         Yup.watermark += 1
@@ -36,7 +36,12 @@ module Yup
           @logger.info "Success"
         else
           log_response(http)
-          @logger.info "Fail; will not retry"
+          if Yup.retry_unless_2xx
+            @logger.info "Fail: got status code #{http.response_header.status}; will retry after #{Yup.resend_delay} seconds"
+            EventMachine.add_timer(Yup.resend_delay, &self.method(:retry))
+          else
+            @logger.info "Fail; will not retry"
+          end
         end
       end
 
@@ -114,7 +119,14 @@ module Yup
             @logger.info "Success"
           else
             log_response(raw_response, response_body, http)
-            @logger.info "Fail; will not retry"
+            if Yup.retry_unless_2xx
+              @logger.info "Fail: got status code #{http.status_code}; will retry after #{Yup.resend_delay} seconds"
+              @state.to_feedback(Yajl::Encoder.encode([@http_method.downcase, @request_url, headers, body]))
+
+              sleep Yup.resend_delay
+            else
+              @logger.info "Fail; will not retry"
+            end
           end
 
         rescue Exception, Timeout::Error => e

data/test/test_persistence_yup.rb

@@ -31,13 +31,16 @@ class TestPersistenceYup < MiniTest::Unit::TestCase
       case $attempts
       when 0
       when 1
+        send_data "HTTP/1.1 400 OK\r\nServer: test\r\n\r\n"
+        close_connection_after_writing
+      when 2
         send_data "HTTP/1.1 200 OK\r\nServer: test\r\n\r\n"
         close_connection_after_writing
       end
     end
 
     def unbind
-      if $attempts > 0
+      if $attempts >= 2
         EM.add_timer(1) do
           Process.kill("KILL", $pid)
           EM.stop_event_loop()
@@ -75,7 +78,8 @@ class TestPersistenceYup < MiniTest::Unit::TestCase
     state       = Yup::State.new(dbpath, forward_to, feedback_channel)
     timeout     = 1
 
-    Yup.resend_delay = 1
+    Yup.resend_delay     = 1
+    Yup.retry_unless_2xx = true
 
     $pid = Process.fork do
       Yup::State::RequestForwarder.new(state, forward_to, timeout).run_loop
@@ -89,7 +93,7 @@ class TestPersistenceYup < MiniTest::Unit::TestCase
     }
 
     assert       $client_parser
-    assert_equal 200,   $client_parser.status_code
+    assert_equal 200,    $client_parser.status_code
     assert_equal "yupd", $client_parser.headers["Server"]
     assert       $service_parser
     assert_equal "/foo", $service_parser.request_url

data/test/test_yup.rb

@@ -27,12 +27,15 @@ class TestYup < MiniTest::Unit::TestCase
       case $attempts
       when 0
       when 1
+        send_data "HTTP/1.1 400 OK\r\nServer: test\r\n\r\n"
+      when 2
         send_data "HTTP/1.1 200 OK\r\nServer: test\r\n\r\n"
+        close_connection_after_writing
       end
     end
 
     def unbind
-      if $attempts > 0
+      if $attempts >= 2
         EM.next_tick { EM.stop_event_loop }
       end
     end
@@ -64,7 +67,8 @@ class TestYup < MiniTest::Unit::TestCase
     state       = nil
     timeout     = 1
 
-    Yup.resend_delay = 1
+    Yup.resend_delay     = 1
+    Yup.retry_unless_2xx = true
 
     EM.run {
       EM.start_server("127.0.0.1", 16785, Service)

data/yup.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "yup"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Denis Sukhonin"]
-  s.date = "2012-11-09"
+  s.date = "2012-12-19"
   s.description = "Just answers 200 (or specified) to a client and asynchronously forwards HTTP request to a configured host"
   s.email = "d.sukhonin@gmail.com"
   s.executables = ["yupd"]
@@ -53,9 +53,9 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<tuple>, [">= 0"])
       s.add_runtime_dependency(%q<yajl-ruby>, [">= 0"])
       s.add_development_dependency(%q<bdb>, [">= 0"])
-      s.add_development_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_development_dependency(%q<yard>, ["~> 0.8.0"])
       s.add_development_dependency(%q<minitest>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
+      s.add_development_dependency(%q<bundler>, ["~> 1.2"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_development_dependency(%q<simplecov>, [">= 0"])
       s.add_development_dependency(%q<simplecov-rcov>, [">= 0"])
@@ -67,9 +67,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<tuple>, [">= 0"])
       s.add_dependency(%q<yajl-ruby>, [">= 0"])
       s.add_dependency(%q<bdb>, [">= 0"])
-      s.add_dependency(%q<yard>, ["~> 0.6.0"])
+      s.add_dependency(%q<yard>, ["~> 0.8.0"])
       s.add_dependency(%q<minitest>, [">= 0"])
-      s.add_dependency(%q<bundler>, ["~> 1.0"])
+      s.add_dependency(%q<bundler>, ["~> 1.2"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
       s.add_dependency(%q<simplecov>, [">= 0"])
       s.add_dependency(%q<simplecov-rcov>, [">= 0"])
@@ -82,9 +82,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<tuple>, [">= 0"])
     s.add_dependency(%q<yajl-ruby>, [">= 0"])
     s.add_dependency(%q<bdb>, [">= 0"])
-    s.add_dependency(%q<yard>, ["~> 0.6.0"])
+    s.add_dependency(%q<yard>, ["~> 0.8.0"])
     s.add_dependency(%q<minitest>, [">= 0"])
-    s.add_dependency(%q<bundler>, ["~> 1.0"])
+    s.add_dependency(%q<bundler>, ["~> 1.2"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
     s.add_dependency(%q<simplecov>, [">= 0"])
     s.add_dependency(%q<simplecov-rcov>, [">= 0"])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yup
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-09 00:00:00.000000000 Z
+date: 2012-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.8.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -262,7 +262,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2564994728519902623
+      hash: 3705403609961748378
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: