yup 0.0.2 → 0.0.3

data/README.rdoc

@@ -21,7 +21,6 @@ Now problem of availability of errbit is assigned to the yupd.
 == Roadmap to 0.1
 
 * Daemonize
-* Logger
 * Preforking
 * Persistent HTTP requests queue
 * A configurable map of different delegating rules

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.0.3

data/bin/yupd

@@ -16,7 +16,8 @@ Options:
   --status-code <code>       Send status code to a client on request (default 200)
   --resend-delay <seconds>   Resend failed requests in seconds (default 5.0)
   --watermark <number>       Maximum of concurrent requests (default 100)
-  --loglevel <level>         Logging severity (default info). Available log levels: debug, warn, info. 
+  --loglevel <level>         Logging severity (default fatal).
+                             Available log levels: fatal, error, warn, info, debug.
 
 Examples:
   yupd --listen 0.0.0.0:8081 --status-code 201 errbit.host.somewhere
@@ -24,6 +25,14 @@ Examples:
 EOF
 end
 
+LEVELS = {
+  "fatal" => Logger::FATAL,
+  "error" => Logger::ERROR,
+  "warn"  => Logger::WARN,
+  "info"  => Logger::INFO,
+  "debug" => Logger::DEBUG
+}.freeze
+
 opts = GetoptLong.new(*[['--help',         '-h', GetoptLong::NO_ARGUMENT],
                         ['--listen',       '-l', GetoptLong::REQUIRED_ARGUMENT],
                         ['--status-code',        GetoptLong::REQUIRED_ARGUMENT],
@@ -31,12 +40,8 @@ opts = GetoptLong.new(*[['--help',         '-h', GetoptLong::NO_ARGUMENT],
                         ['--watermark',          GetoptLong::REQUIRED_ARGUMENT],
                         ['--loglevel',           GetoptLong::REQUIRED_ARGUMENT],
                         ])
-config = {}
-levels = {
-  "info"  => Logger::INFO,
-  "warn"  => Logger::WARN,
-  "debug" => Logger::DEBUG
-}
+config = {:loglevel => LEVELS["fatal"]}
+
 opts.each do |opt, arg|
   case opt
   when '--help', '-h'
@@ -51,12 +56,12 @@ opts.each do |opt, arg|
   when '--watermark'
     config[:watermark] = arg.to_i
   when '--loglevel'
-    if levels.key? arg.to_s
-      config[:loglevel] = levels[arg.to_s]
+    if LEVELS.has_key?(arg)
+      config[:loglevel] = LEVELS[arg]
     else
       puts "ERROR: Wrong log level"
       usage
-      exit 0
+      exit 1
     end
   end
 end
@@ -69,6 +74,7 @@ end
 
 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.run(config)

data/lib/yup.rb

@@ -14,19 +14,20 @@ module Yup
   def self.watermark; @@watermark end
   def self.watermark=(seconds); @@watermark = seconds end
 
+  @@logger = Logger.new(STDOUT)
+  def self.logger; @@logger end
+  def self.logger=(logger); @@logger = logger end
+
   def self.run(config)
     host = config[:listen_host] || 'localhost'
     port = config[:listen_port] || 8080
     status_code = config[:status_code] || 200
     forward_to  = config[:forward_to]
 
-    logger = Logger.new(STDOUT)
-    logger.level = config[:loglevel]
-
     EventMachine::run do
       EventMachine::start_server(host, port, RequestHandler,
                                  forward_to, status_code)
-      logger.info "listening on #{host}:#{port}"
+      logger.info { "listening on #{host}:#{port}" }
     end
   end
 end

data/lib/yup/request_forwarder.rb

@@ -6,6 +6,8 @@ module Yup
       @parser     = parser
       @body       = body
       @forward_to = forward_to
+
+      @logger = Yup.logger
     end
 
     def run
@@ -21,18 +23,18 @@ module Yup
         Yup.watermark += 1
 
         if http.response_header.status / 100 == 2
-          logger.info '--- SUCCESS'
+          @logger.info '--- SUCCESS'
         else
-          logger.info '--- FAIL'
-          # logger.debug http.response_header.inspect
-          # logger.debug http.response
-          logger.debug http
+          @logger.info '--- FAIL'
+          @logger.debug { http.inspect }
+          @logger.debug { http.response_header.inspect }
+          @logger.debug { http.response.inspect }
         end
       end
 
       http.errback do
-        logger.info '--- ERROR'
-        logger.debug http
+        @logger.info '--- ERROR'
+        @logger.debug { http.inspect }
 
         EventMachine.add_timer(Yup.resend_delay) { self.run }
       end

data/lib/yup/request_handler.rb

@@ -8,7 +8,9 @@ module Yup
     def initialize(forward_to, status_code)
       @forward_to  = forward_to
       @status_code = status_code
-      @chunks     = []
+
+      @logger = Yup.logger
+      @chunks = []
     end
 
     def post_init
@@ -28,11 +30,11 @@ module Yup
     end
 
     def on_message_complete
-      logger.info  "-- got request"
-      logger.info  "HTTP version: "      + @parser.http_version
-      logger.info  "HTTP method : "      + @parser.http_method # for requests
-      logger.info  "HTTP request_url : " + @parser.request_url
-      logger.debug "HTTP headers : "     + @parser.headers
+      @logger.info  "-- got request"
+      @logger.info  { "HTTP version : "     + @parser.http_version.join('.') }
+      @logger.info  { "HTTP method : "      + @parser.http_method }
+      @logger.info  { "HTTP request_url : " + @parser.request_url }
+      @logger.debug { "HTTP headers : "     + @parser.headers.inspect }
 
       resp = WEBrick::HTTPResponse.new(:HTTPVersion => '1.1')
       resp.status = @status_code
@@ -46,7 +48,7 @@ module Yup
           RequestForwarder.new(@parser, @body, @forward_to).run
         end
       else
-        logger.error "-- watermark is reached, drop"
+        @logger.error "-- watermark is reached, drop"
       end
     end
   end

data/yup.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{yup}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Denis Sukhonin"]
-  s.date = %q{2011-08-16}
+  s.date = %q{2011-08-17}
   s.default_executable = %q{yupd}
   s.description = %q{Just answers 200 (or specified) to a client and asynchronously forwards HTTP request to a configured host}
   s.email = %q{d.sukhonin@gmail.com}

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Denis Sukhonin
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-16 00:00:00 +04:00
+date: 2011-08-17 00:00:00 +04:00
 default_executable: yupd
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -165,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -1930386845878587074
+      hash: -3474122509911024601
       segments: 
       - 0
       version: "0"