redis-stat 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88b48d390b0584414c03baf3f3201af816bf89e9
-  data.tar.gz: 8cba293490f939431fc0aa82a45f06ae3f7a140b
+  metadata.gz: f077a3bea5627a3c4a8facf1fe28f4f3f3d93672
+  data.tar.gz: 6f6441674aa5557d68ed441ed416e6ec5a1ae146
 SHA512:
-  metadata.gz: fc1a3324b2f435c39edb17114fa96714ac3e1e24ba2e1f57a8f9d89ec6ad1c7bb54d209beb9e1f151d391d0ef94a5114850d79f19585f6d38606aba38429f04c
-  data.tar.gz: 3fdc739c0858e5830760e2b227a8562e73b611f745f0456de1c150c6a240e9bdc10372ce78eb9b7b278c77b9932db18e88967fe44a0e26e83680b7b67e976728
+  metadata.gz: 7a1dd553225f59b1bc0bea4a7945e06ce721f90461789bc45ef6df1f889df5bb02b08fd2c33f8c4a1024a434b21c9d354480092efccde8cf6be4774925701d3a
+  data.tar.gz: 9fc292656976fd799d785bfcc1aed5b66a0e157333f8b552b48c38decb4606563fe30ce805eb7a38195d5ab7d2b1b8814c88ed6f9c2307557ea243daece3bde0

data/README.md

@@ -103,7 +103,3 @@ the original [redis-stat](https://github.com/antirez/redis-tools/blob/master/red
 included in [redis-tools](https://github.com/antirez/redis-tools) written by the creator of Redis himself. (My bad)
 Although the original C-version hasn't been updated for the past couple of years, you might want to check it out first.
 
-
-
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/junegunn/redis-stat/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
-

data/lib/redis-stat.rb

@@ -14,6 +14,7 @@ require 'parallelize'
 require 'si'
 require 'rbconfig'
 require 'lps'
+require 'readline'
 
 class RedisStat
   attr_reader :hosts, :measures, :tab_measures, :verbose, :interval
@@ -26,9 +27,10 @@ class RedisStat
     options[:style] = :ascii if windows
 
     @hosts         = options[:hosts]
-    @redises       = @hosts.map { |e|
+    @redises       = @hosts.inject({}) { |hash, e|
       host, port   = e.split(':')
-      Redis.new(Hash[ {:host => host, :port => port, :timeout => DEFAULT_REDIS_TIMEOUT}.select { |k, v| v } ])
+      hash[e] = Redis.new(Hash[ {:host => host, :port => port, :timeout => DEFAULT_REDIS_TIMEOUT}.select { |k, v| v } ])
+      hash
     }
     @interval      = options[:interval]
     @max_count     = options[:count]
@@ -49,10 +51,6 @@ class RedisStat
     @elasticsearch = options[:es] && ElasticsearchSink.new(@hosts, options[:es])
   end
 
-  def info
-    collect
-  end
-
   def start output_stream
     @os = output_stream
     trap('INT') { Thread.main.raise Interrupt }
@@ -65,37 +63,41 @@ class RedisStat
       @started_at = Time.now
       prev_info   = nil
       server      = start_server if @server_port
+      errors      = 0
 
       LPS.interval(@interval).loop do
-        errs = 0
-        info =
+        info, exceptions =
           begin
             collect
           rescue Interrupt
             raise
-          rescue Exception => e
-            if need_auth?(e)
-              authenticate!
-              retry
-            end
-
-            errs += 1
-            if server || errs < NUM_RETRIES
-              @os.puts if errs == 1
-              @os.puts "#{e} (#{ server ? "#{errs}" : [errs, NUM_RETRIES].join('/') })".red.bold
-              server.alert "#{e} (#{errs})" if server
-              sleep @interval
-              retry
-            else
-              raise
-            end
           end
+
+        if exceptions.any? { |k, v| need_auth? v }
+          authenticate!
+          next
+        end
+
+        output_es info if @elasticsearch
+
+        unless exceptions.empty?
+          now = Time.now.strftime('%Y/%m/%d %H:%M:%S')
+          msgs = exceptions.map { |h, x| "[#{now}@#{h}] #{x}" }
+          @os.puts if (errors += 1) == 1
+          @os.puts msgs.join($/).red.bold
+          server.alert msgs.first if server
+          sleep @interval
+          next
+        end
+
         info_output = process info, prev_info
-        output info, info_output, csv
-        server.push info, Hash[info_output] if server
+        output_static_info info if @count == 0
+        output info_output, csv
+        server.push @hosts, info, Hash[info_output] if server
         prev_info = info
 
         @count += 1
+        errors = 0
         break if @max_count && @count >= @max_count
       end
       @os.puts
@@ -107,7 +109,6 @@ class RedisStat
         @server_thr.join
       end
     rescue Exception => e
-      @os.puts
       @os.puts e.to_s.red.bold
       raise
     ensure
@@ -120,7 +121,7 @@ private
   def start_server
     RedisStat::Server.set :port, @server_port
     RedisStat::Server.set :redis_stat, self
-    RedisStat::Server.set :last_info, info
+    RedisStat::Server.set :last_info, collect.first
     @server_thr = Thread.new { RedisStat::Server.run! }
     RedisStat::Server.wait_until_running
     trap('INT') { Thread.main.raise Interrupt }
@@ -128,45 +129,47 @@ private
   end
 
   def collect
-    {}.insensitive.tap do |info|
-      class << info
-        def sumf label
-          (self[label] || []).map(&:to_f).inject(:+)
-        end
+    info = {
+      :at => Time.now.to_f,
+      :instances => Hash.new { |h, k| h[k] = {}.insensitive }
+    }
+    class << info
+      def sumf label
+        self[:instances].values.map { |hash| hash[label].to_f }.inject(:+)
       end
+    end
+    exceptions = {}
 
-      info[:at] = Time.now.to_f
-      @redises.pmap(@redises.length) { |redis|
-        redis.info.insensitive
-      }.each do |rinfo|
+    @hosts.pmap(@hosts.length) { |host|
+      begin
+        [host, @redises[host].info.insensitive]
+      rescue Exception => e
+        [host, e]
+      end
+    }.each do |host, rinfo|
+      if rinfo.is_a?(Exception)
+        exceptions[host] = rinfo
+      else
         (@all_measures + rinfo.keys.select { |k| k =~ /^db[0-9]+$/ }).each do |k|
           ks = [*k]
           v = ks.map { |e| rinfo[e] }.compact.first
           k = ks.first
-          info[k] ||= []
-          info[k] << v
+          info[:instances][host][k] = v
         end
       end
     end
+    [info, exceptions]
   end
 
   def update_term_size!
     if RUBY_PLATFORM == 'java'
       require 'java'
       begin
-        case JRUBY_VERSION
-        when /^1\.7/
-          # TODO Currently Windows terminal is not supported: always returns 80x24
-          @term ||= Java::jline.console.ConsoleReader.new.getTerminal
-          @term_width  = (@term.width rescue DEFAULT_TERM_WIDTH)
-          @term_height = (@term.height rescue DEFAULT_TERM_HEIGHT) - 4
-          return
-        when /^1\.6/
-          @term ||= Java::jline.ConsoleReader.new.getTerminal
-          @term_width  = (@term.getTerminalWidth rescue DEFAULT_TERM_WIDTH)
-          @term_height = (@term.getTerminalHeight rescue DEFAULT_TERM_HEIGHT) - 4
-          return
-        end
+        @term ||= (Java::jline.console.ConsoleReader.new.getTerminal) rescue
+                  (Java::jline.ConsoleReader.new.getTerminal)
+        @term_width  = (@term.width rescue DEFAULT_TERM_WIDTH)
+        @term_height = (@term.height rescue DEFAULT_TERM_HEIGHT) - 4
+        return
       rescue Exception
         # Fallback to tput (which yields incorrect values as of now)
       end
@@ -204,8 +207,6 @@ private
 
     movement = nil
     if @count == 0
-      output_static_info info
-
       movement = 0
     elsif @count % @term_height == 0
       @first_batch = false
@@ -245,7 +246,7 @@ private
       @os.print $/ + lines.join($/)
       @os.flush
     rescue Interrupt
-      move! -movement
+      move!(-movement)
       raise
     end
   end
@@ -259,15 +260,14 @@ private
     tab << [nil] + @hosts.map { |h| h.bold.green }
     tab.separator!
     @tab_measures.each do |key|
-      tab << [key.to_s.bold] + info[key] unless info[key].compact.empty?
+      tab << [key.to_s.bold] + @hosts.map { |host| info[:instances][host][key] }
     end
     @os.puts tab
   end
 
-  def output info, info_output, file
-    output_term info_output       unless @daemonized
+  def output info_output, file
+    output_term info_output unless @daemonized
     output_file info_output, file if file
-    output_es   info              if @elasticsearch
   end
 
   def output_es info
@@ -380,7 +380,7 @@ private
   end
 
   def authenticate!
-    @redises.each do |r|
+    @redises.values.each do |r|
       r.ping rescue (r.auth @auth)
     end if @auth
   end

data/lib/redis-stat/constants.rb

@@ -4,8 +4,6 @@ class RedisStat
   DEFAULT_SERVER_PORT   = 63790
   DEFAULT_REDIS_TIMEOUT = 30
 
-  NUM_RETRIES = 5
-
   MEASURES = {
     :static => [
       :redis_version,

data/lib/redis-stat/elasticsearch.rb

@@ -38,14 +38,13 @@ class ElasticsearchSink
   end
 
   def output info
-    results = convert_to_i info
-    results.map do |host, entries|
+    convert_to_i(info).map do |host, entries|
       time = entries[:at]
       entry = {
         :index => index,
         :type  => "redis",
         :body  => entries.merge({
-          :@timestamp => Time.at(time).strftime("%FT%T%:z"),
+          :@timestamp => format_time(time),
           :host       => host
         }),
       }
@@ -55,29 +54,29 @@ class ElasticsearchSink
   end
 
 private
-  def link_hosts_to_info info
-    {}.tap do |output|
-      hosts.each_with_index do |host, index|
-        output[host] = {}.tap do |host_output|
-          info.each do |name, entries|
-            value = name == :at ? entries : entries[index]
-            host_output[name] = value
-          end
-        end
-      end
+  if RUBY_VERSION.start_with? '1.8.'
+    def format_time time
+      fmt = Time.at(time).strftime("%FT%T%z")
+      fmt[0..-3] + ':' + fmt[-2..-1]
+    end
+  else
+    def format_time time
+      Time.at(time).strftime("%FT%T%:z")
     end
   end
 
   def convert_to_i info
-    info = link_hosts_to_info info
-    info.each do |host, entries|
+    Hash[info[:instances].map { |host, entries|
+      output = {}
+      output[:at] = info[:at].to_i
       entries.each do |name, value|
         convert = RedisStat::LABELS[name] || TO_I[name]
         if convert
-          entries[name] = value.to_i
+          output[name] = value.to_i
         end
       end
-    end
+      [host, output]
+    }]
   end
 end
 end

data/lib/redis-stat/option.rb

@@ -14,7 +14,7 @@ module Option
     argv = argv.reject { |e| e == '-h' }
 
     options = DEFAULT.dup
-    opts = ::OptionParser.new { |opts|
+    op = ::OptionParser.new { |opts|
       opts.banner = "usage: redis-stat [HOST[:PORT] ...] [INTERVAL [COUNT]]"
       opts.separator ''
 
@@ -69,7 +69,7 @@ module Option
     }
 
     begin
-      opts.parse! argv
+      op.parse! argv
 
       is_number   = lambda { |str| str =~ /^([0-9]\.?[0-9]*)$|^([1-9][0-9]*)$/ }
 
@@ -87,7 +87,7 @@ module Option
       exit e.status
     rescue Exception => e
       puts e.to_s
-      puts opts
+      puts op
       exit 1
     end
   end

data/lib/redis-stat/server.rb

@@ -83,9 +83,9 @@ class Server < Sinatra::Base
       end
     end
 
-    def push info, data
+    def push hosts, info, data
       static = Hash[settings.redis_stat.tab_measures.map { |stat|
-        [stat, info[stat]]
+        [stat, hosts.map { |h| info[:instances][h][stat] }]
       }]
       data = {:at => (Time.now.to_f * 1000).to_i, :static => static, :dynamic => data}
 

data/lib/redis-stat/server/views/index.erb

@@ -101,9 +101,9 @@
               <tbody>
                 <% @tab_measures.each do |stat| %>
                 <tr id="<%= stat %>">
-                  <% @hosts.each_with_index do |host, idx| %>
+                  <% @hosts.each do |host| %>
                   <td>
-                    <%= @info[stat][idx] %>
+                    <%= @info[:instances][host][stat] %>
                   </td>
                   <% end %>
                 </tr>

data/lib/redis-stat/version.rb

@@ -1,3 +1,3 @@
 class RedisStat
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/test/test_redis-stat.rb

@@ -203,7 +203,7 @@ class TestRedisStat < MiniTest::Unit::TestCase
     {
       'localhost/index'         => %w[http://localhost index],
       'https://localhost/index' => %w[https://localhost index],
-      'https://localhost'       => %w[https://localhost services],
+      'https://localhost'       => %w[https://localhost redis-stat],
       'httpserver:9200/index'   => %w[http://httpserver:9200 index],
     }.each do |arg, ret|
       assert_equal ret, RedisStat::ElasticsearchSink.parse_url(arg)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-stat
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Junegunn Choi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-03 00:00:00.000000000 Z
+date: 2014-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi256