redis-stat 0.3.1 → 0.3.2

data/lib/redis-stat/constants.rb

@@ -9,14 +9,15 @@ class RedisStat
   MEASURES = {
     :static => [
       :redis_version,
+      :redis_mode,
       :process_id,
       :uptime_in_seconds,
       :uptime_in_days,
-      :gcc_version,
       :role,
       :connected_slaves,
       :aof_enabled,
-      :vm_enabled
+      [:rdb_bgsave_in_progress, :bgsave_in_progress],
+      [:rdb_last_save_time, :last_save_time],
     ],
     :default => [
       :at,
@@ -57,7 +58,7 @@ class RedisStat
       :keyspace_misses,
       :aof_current_size,
       :aof_base_size,
-      :changes_since_last_save,
+      [:rdb_changes_since_last_save, :changes_since_last_save],
       :pubsub_channels,
       :pubsub_patterns,
     ]
@@ -85,7 +86,7 @@ class RedisStat
     :keyspace_misses_per_second          => [:magenta],
     :aof_current_size                    => [:cyan],
     :aof_base_size                       => [:cyan],
-    :changes_since_last_save             => [:green, :bold],
+    :rdb_changes_since_last_save         => [:green, :bold],
     :pubsub_channels                     => [:cyan, :bold],
     :pubsub_patterns                     => [:cyan, :bold],
   }
@@ -112,7 +113,7 @@ class RedisStat
     :keyspace_misses_per_second          => 'mis/s',
     :aof_current_size                    => 'aofcs',
     :aof_base_size                       => 'aofbs',
-    :changes_since_last_save             => 'chsv',
+    :rdb_changes_since_last_save         => 'chsv',
     :pubsub_channels                     => 'psch',
     :pubsub_patterns                     => 'psp',
   }

data/lib/redis-stat/option.rb

@@ -42,9 +42,6 @@ module Option
 
       opts.on('--server[=PORT]', "Launch redis-stat web server (default port: #{RedisStat::DEFAULT_SERVER_PORT})") do |v|
         options[:server_port] = v || RedisStat::DEFAULT_SERVER_PORT
-        if RUBY_PLATFORM == 'java'
-          raise ArgumentError.new("Sorry. redis-stat server is not supported in JRuby.")
-        end
       end
 
       opts.on('--daemon', "Daemonize redis-stat. Must be used with --server option.") do |v|
@@ -66,7 +63,7 @@ module Option
         exit 0
       end
     }
-    
+
     begin
       opts.parse! argv
 
@@ -125,7 +122,7 @@ module Option
         raise ArgumentError.new("Invalid style")
       end
     end
-    
+
     if options[:daemon] && options[:server_port].nil?
       raise ArgumentError.new("--daemon option must be used in conjunction with --server option")
     end

data/lib/redis-stat/server/public/js/site.js

@@ -5,8 +5,7 @@ var history = [],
     colors,
     info,
     fade_dur,
-    chart_options,
-    stats_to_update = ['uptime_in_seconds', 'uptime_in_days']
+    chart_options
 
 var initialize = function(params) {
   measures = params.measures
@@ -89,7 +88,7 @@ var initialize = function(params) {
         shadow: false,
       },
       series: [
-        { label: "used" },
+        { label: "mem" },
         { label: "rss" }
       ],
       axesDefaults: {
@@ -134,8 +133,13 @@ var initialize = function(params) {
 }
 
 var appendToHistory = function(json) {
-  history.push(json)
-  if (history.length > max) history.shift()
+  if (history.length == 0 || json.at > history[ history.length - 1 ].at) {
+    history.push(json)
+    if (history.length > max) history.shift()
+    return true
+  } else {
+    return false
+  }
 }
 
 var updateTable = function() {
@@ -144,12 +148,10 @@ var updateTable = function() {
       jd   = json.dynamic
 
   // Instance information (mostly static)
-  // for (stat in js) {
-  for (var i = 0; i < stats_to_update.length; ++i) {
-    var stat = stats_to_update[i]
+  for (var stat in js) {
     $("#" + stat).replaceWith(
       "<tr id='" + stat + "'><th>" + stat + "</th>" +
-      js[stat].map(function(e) { return "<td>" + e + "</td>" }).join() +
+      js[stat].map(function(e) { return "<td>" + (e == null ? "" : e) + "</td>" }).join() +
       "</tr>"
     )
   }

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

@@ -26,6 +26,11 @@
       <div class="row">
         <div class="span12">
           <h3>Dashboard</h3>
+          <% unless RUBY_PLATFORM == 'java' %>
+          <div class="alert alert-error hide">
+            <h4>Lost connection to redis-stat</h4>
+          </div>
+          <% end %>
         </div>
       </div>
 
@@ -80,7 +85,7 @@
               </tr>
             </thead>
             <tbody>
-              <% RedisStat::MEASURES[:static].each do |stat| %>
+              <% @tab_measures.each do |stat| %>
               <tr id="<%= stat %>">
                 <th>
                   <%= stat %>
@@ -103,19 +108,6 @@
       <img style="position: fixed; top: 0; right: 0; border: 0; z-index: 10000" src="/forkme.png" alt="Fork me on GitHub">
     </a>
 
-    <div class="modal hide fade" id="fail" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
-      <div class="modal-header">
-        <h3 id="myModalLabel">Oops!</h3>
-      </div>
-      <div class="modal-body">
-        <p>Lost connection to redis-stat.</p>
-        <p>Try reloading the page.</p>
-      </div>
-      <div class="modal-footer">
-        <a href="/" class="btn btn-primary">Reload</a>
-      </div>
-    </div>
-
     <footer class="footer">
       <div class="container">
         <p>Powered by <a href="http://twitter.github.com/bootstrap/">Bootstrap</a>, <a href="http://jquery.com/">jQuery</a> and <a href="http://www.jqplot.com/">jqPlot</a>.</p>
@@ -134,15 +126,19 @@
 
         $("#stat_table th a").tooltip()
 
+        // TODO Check (typeof(EventSource) !== "undefined")
+
         var source = new EventSource("/pull")
         source.onmessage = function(e) {
-          appendToHistory(JSON.parse(e.data))
-          updateTable()
-          updatePlot()
+          if (appendToHistory(JSON.parse(e.data))) {
+            $(".alert").fadeOut()
+            updateTable()
+            updatePlot()
+          }
         }
         source.onerror = function(e) {
-          source.close()
-          $('#fail').modal({backdrop: 'static'})
+          $(".alert").fadeIn()
+          // source.close()
         }
       })
     </script>

data/lib/redis-stat/server.rb

@@ -1,5 +1,6 @@
 require 'sinatra/base'
 require 'json'
+require 'thread'
 
 class RedisStat
 class Server < Sinatra::Base
@@ -7,7 +8,10 @@ class Server < Sinatra::Base
   STAT_TABLE_ROWS = 10
 
   configure do
-    unless RUBY_PLATFORM == 'java'
+    if RUBY_PLATFORM == 'java'
+      require 'puma'
+      set :server, :puma
+    else
       require 'thin'
       set :server, :thin
     end
@@ -15,24 +19,32 @@ class Server < Sinatra::Base
     set :root, File.join( File.dirname(__FILE__), 'server' )
     set :clients, []
     set :history, []
+    set :mutex, Mutex.new
   end
 
   get '/' do
-    @hosts    = settings.redis_stat.hosts
-    @info     = settings.redis_stat.info
-    @measures = settings.redis_stat.measures
-    @interval = settings.redis_stat.interval
-    @verbose  = settings.redis_stat.verbose ? 'verbose' : ''
-    @history  = settings.history
+    @hosts        = settings.redis_stat.hosts
+    @info         = settings.redis_stat.info
+    @measures     = settings.redis_stat.measures
+    @tab_measures = settings.redis_stat.tab_measures
+    @interval     = settings.redis_stat.interval
+    @verbose      = settings.redis_stat.verbose ? 'verbose' : ''
+    @history      = settings.history
     erb :index
   end
 
   get '/pull' do
     content_type 'text/event-stream'
 
-    stream(:keep_open) do |out|
-      settings.clients << out
-      out.callback { settings.clients.delete out }
+    if RUBY_PLATFORM == 'java'
+      if last = settings.mutex.synchronize { settings.history.last }
+        body "retry: #{settings.redis_stat.interval * 900}\ndata: #{last.to_json}\n\n"
+      end
+    else
+      stream(:keep_open) do |out|
+        settings.clients << out
+        out.callback { settings.clients.delete out }
+      end
     end
   end
 
@@ -44,14 +56,18 @@ class Server < Sinatra::Base
     end
 
     def push info, data
-      static = Hash[RedisStat::MEASURES[:static].map { |stat|
+      static = Hash[settings.redis_stat.tab_measures.map { |stat|
         [stat, info[stat]]
       }]
-      data = {:static => static, :dynamic => data}
+      data = {:at => Time.now.to_i, :static => static, :dynamic => data}
+
+      hist = settings.history
+      settings.mutex.synchronize do
+        hist << data
+        hist.shift if hist.length > HISTORY_LENGTH
+      end
 
-      @history = settings.history
-      @history << data
-      @history.shift if @history.length > HISTORY_LENGTH
+      return if settings.clients.empty?
 
       resp = "data: #{data.to_json}\n\n"
       settings.clients.each do |cl|

data/lib/redis-stat/version.rb

@@ -1,3 +1,3 @@
 class RedisStat
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

data/lib/redis-stat.rb

@@ -3,7 +3,7 @@
 require 'redis-stat/version'
 require 'redis-stat/constants'
 require 'redis-stat/option'
-require 'redis-stat/server' unless RUBY_PLATFORM == 'java'
+require 'redis-stat/server'
 require 'insensitive_hash'
 require 'redis'
 require 'tabularize'
@@ -13,12 +13,12 @@ require 'parallelize'
 require 'si'
 
 class RedisStat
-  attr_reader :hosts, :measures, :verbose, :interval
+  attr_reader :hosts, :measures, :tab_measures, :verbose, :interval
 
   def initialize options = {}
     options      = RedisStat::Option::DEFAULT.merge options
     @hosts       = options[:hosts]
-    @redises     = @hosts.map { |e| 
+    @redises     = @hosts.map { |e|
       host, port = e.split(':')
       Redis.new(Hash[ {:host => host, :port => port, :timeout => DEFAULT_REDIS_TIMEOUT}.select { |k, v| v } ])
     }
@@ -29,7 +29,8 @@ class RedisStat
     @csv         = options[:csv]
     @auth        = options[:auth]
     @verbose     = options[:verbose]
-    @measures    = MEASURES[ @verbose ? :verbose : :default ]
+    @measures    = MEASURES[ @verbose ? :verbose : :default ].map { |m| [*m].first }
+    @tab_measures= MEASURES[:static].map { |m| [*m].first }
     @all_measures= MEASURES.values.inject(:+).uniq - [:at]
     @count       = 0
     @style       = options[:style]
@@ -72,9 +73,12 @@ class RedisStat
           rescue Interrupt
             raise
           rescue Exception => e
-            if (errs += 1) < NUM_RETRIES
+            errs += 1
+            if server || errs < NUM_RETRIES
               @os.puts if errs == 1
-              @os.puts ansi(:red, :bold) { "#{e} (#{errs}/#{NUM_RETRIES})" }
+              @os.puts ansi(:red, :bold) {
+                "#{e} (#{ server ? "#{errs}" : [errs, NUM_RETRIES].join('/') })"
+              }
               sleep @interval
               retry
             else
@@ -128,8 +132,11 @@ private
         redis.info.insensitive
       }.each do |rinfo|
         (@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] << rinfo[k]
+          info[k] << v
         end
       end
     end
@@ -241,7 +248,7 @@ private
     )
     tab << [nil] + @hosts.map { |h| ansi(:bold, :green) { h } }
     tab.separator!
-    MEASURES[:static].each do |key|
+    @tab_measures.each do |key|
       tab << [ansi(:bold) { key }] + info[key] unless info[key].compact.empty?
     end
     @os.puts tab
@@ -260,7 +267,7 @@ private
     table << info_output.map { |pair|
       ansi(*((@colors[pair.first] || []) + [:underline])) {
         LABELS[pair.first] || pair.first
-      } 
+      }
     }
     table.separator!
     table
@@ -292,7 +299,7 @@ private
       val &&= (val * 100).round
       [humanize_number(val), val]
     when :keys
-      val = Hash[ info.select { |k, v| k =~ /^db[0-9]+$/ } ].values.inject(0) { |sum, vs| 
+      val = Hash[ info.select { |k, v| k =~ /^db[0-9]+$/ } ].values.inject(0) { |sum, vs|
         sum + vs.map { |v| Hash[ v.split(',').map { |e| e.split '=' } ]['keys'].to_i }.inject(:+)
       }
       [humanize_number(val), val]

data/redis-stat.gemspec

@@ -17,15 +17,18 @@ Gem::Specification.new do |gem|
   gem.version       = RedisStat::VERSION
 
   gem.add_runtime_dependency "ansi", '~> 1.4.3'
-  gem.add_runtime_dependency "redis", '~> 3.0.1'
-  gem.add_runtime_dependency "tabularize", '~> 0.2.8'
+  gem.add_runtime_dependency "redis", '~> 3.0.2'
+  gem.add_runtime_dependency "tabularize", '~> 0.2.9'
   gem.add_runtime_dependency "insensitive_hash", '~> 0.3.0'
   gem.add_runtime_dependency "parallelize", '~> 0.4.0'
-  gem.add_runtime_dependency "si", '~> 0.1.3'
-  unless RUBY_PLATFORM == 'java'
-    gem.add_runtime_dependency "sinatra", '~> 1.3.3'
-    gem.add_runtime_dependency "thin", '~> 1.5.0' 
-    gem.add_runtime_dependency "json", '~> 1.7.5'
+  gem.add_runtime_dependency "si", '~> 0.1.4'
+  gem.add_runtime_dependency "sinatra", '~> 1.3.3'
+  gem.add_runtime_dependency "json", '~> 1.7.5'
+
+  if RUBY_PLATFORM == 'java'
+    gem.add_runtime_dependency "puma", '~> 1.6.3'
+  else
+    gem.add_runtime_dependency "thin", '~> 1.5.0'
     gem.add_runtime_dependency "daemons", '~> 1.1.9'
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis-stat
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-31 00:00:00.000000000 Z
+date: 2012-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.1
+        version: 3.0.2
 - !ruby/object:Gem::Dependency
   name: tabularize
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.8
+        version: 0.2.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.2.8
+        version: 0.2.9
 - !ruby/object:Gem::Dependency
   name: insensitive_hash
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: 0.1.4
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -124,13 +124,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 1.3.3
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: json
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.7.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,15 +138,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.7.5
 - !ruby/object:Gem::Dependency
-  name: json
+  name: thin
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.5
+        version: 1.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.5
+        version: 1.5.0
 - !ruby/object:Gem::Dependency
   name: daemons
   requirement: !ruby/object:Gem::Requirement