profit 0.1.2 → 0.1.3

data/bin/profit_server

@@ -8,20 +8,30 @@ OptionParser.new { |opts|
   opts.banner = "Usage: profit_server [options]"
 
   opts.on("-r", "--redis-address [STRING]", String,
-          "Redis Address (127.0.0.1:6379)") do |ra|
+          "Redis Address (default: 127.0.0.1:6379)") do |ra|
     options[:redis_address] = ra.split(":").first
     options[:redis_port]    = ra.split(":").last.to_i
   end
 
   opts.on("-z", "--zmq-address [STRING]", String,
-          "ZMQ Address (tcp://*:5556)") do |za|
+          "ZMQ Address (default: tcp://*:5556)") do |za|
     options[:zmq_address] = za
   end
 
   opts.on("-n", "--pool-size [DECIMAL]", OptionParser::DecimalInteger,
-          "Redis client pool size (10)") do |n|
+          "Redis client pool size (default: 10)") do |n|
     options[:pool_size] = n
   end
+
+  opts.on("-l", "--log-file-path [STRING]", String,
+          "Log file (default: STDOUT)") do |log|
+    options[:log_path] = log
+  end
+
+  opts.on("-v", "--log-level [LOGLEVEL]", [:error, :warn, :info, :debug],
+    "Log level (default: error), error|warn|info|debug") do |log_level|
+    options[:log_level] = log_level
+  end
 }.parse!
 
 Profit::Server.new(options).run

data/lib/profit.rb

@@ -2,6 +2,7 @@ require 'zmq'
 require 'eventmachine'
 require 'em-hiredis'
 require 'json'
+require 'logger'
 
 module Profit
 end

data/lib/profit/server.rb

@@ -10,7 +10,12 @@ module Profit
       @options[:redis_port]    = options[:redis_port]    || 6379
       @options[:zmq_address]   = options[:zmq_address]   || "tcp://*:5556"
       @options[:pool_size]     = options[:pool_size]     || 10
+      @options[:log_path]      = options[:log_path]      || STDOUT
+      @options[:log_level]     = options[:log_level]     || :error
+
+      logger.level = log_level
       @ctx = ZMQ::Context.new
+      logger.info "Starting profit_server with options: #{@options}"
     end
 
     def run
@@ -35,8 +40,8 @@ module Profit
             metric_type  = message_hash.delete("metric_type")
 
             response     = conn.rpush "profit:metric:#{metric_type}", message_hash.to_json
-            response.callback { |resp| puts "callback: #{resp}"}
-            response.errback  { |resp| puts "errback: #{resp}"}
+            response.callback { |resp| logger.debug "callback: #{resp}"}
+            response.errback  { |resp| logger.error "error: #{resp}"}
             response
           end
         end
@@ -45,9 +50,24 @@ module Profit
 
     private
 
+    def logger
+      @logger ||= Logger.new(@options[:log_path])
+    end
+
+    def log_level
+      Logger.const_get(@options[:log_level].upcase)
+    end
+
     def setup_interrupt_handling
-      trap(:INT) { EM.stop }
-      EM.add_shutdown_hook { ctx.destroy }
+      trap(:INT) do
+        logger.debug "trap received, shutting down EM run loop."
+        EM.stop
+      end
+
+      EM.add_shutdown_hook do
+        logger.debug "destroying ZMQ context"
+        ctx.destroy
+      end
     end
 
     def spawn_redis_connections

data/lib/profit/version.rb

@@ -1,3 +1,3 @@
 module Profit
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: profit
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -155,7 +155,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1836147071158890398
+      hash: -957264636356464606
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -164,7 +164,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1836147071158890398
+      hash: -957264636356464606
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23