redis-stat 0.4.1-java → 0.4.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d553a2b4d8425825b0e9478ca8a1a5cd0eea842d
-  data.tar.gz: faac3da66cdf6c54bea638282553106a8a695f37
+  metadata.gz: e0c766e709203cbbc8fe84956b58024190103ae0
+  data.tar.gz: 38c293db9116acf3334ff68e8948a9a46fe5002c
 SHA512:
-  metadata.gz: 8d53092e812d6d9ba9da9bd4f57e1de0dcfd4f133c5450f9b03f4ee973d69ddd9c676e9bb5bc770dfab28606f92b72d6fbd747f71c2c12b3febba54e5e72b247
-  data.tar.gz: cd6a8a4ca1a94995ec7d8defde3ef8417c5d9eeddef9b3d759fa2127410ed87c73e042a6c6563e9c20d99980d120f6031bbffdb254c32b71af2f40eb0c79a609
+  metadata.gz: 6f00650709f31aa0778396c7a5c9c56e89b66a9c327c8fdd6a5f9fb4fd324cd15c6edbf6186a0755a628dbf35bf17a7a728a9ce76bddad55656a9c8704b66435
+  data.tar.gz: 5b9a39596bfd0460ca30a410e298e14b5ce78b8122a64d2a8502e148282bf2d02ad3e1efab54e53229d1795563ed2ae7a74cb4647ea78e48eefdfe4d2c5d9f1a

data/lib/redis-stat.rb

@@ -52,6 +52,7 @@ class RedisStat
   end
 
   def start output_stream
+    @started_at = Time.now
     @os = output_stream
     trap('INT') { Thread.main.raise Interrupt }
 
@@ -60,11 +61,28 @@ class RedisStat
       update_term_size!
       authenticate!
 
-      @started_at = Time.now
-      prev_info   = nil
-      server      = start_server if @server_port
-      errors      = 0
+      # Initial info collection
+      info, x = collect
+      unless x.empty?
+        output_term_errors! format_exceptions(x)
+        exit 1
+      end
+
+      # Check elasticsearch status
+      if @elasticsearch
+        begin
+          output_es info
+        rescue Exception => e
+          output_term_errors! format_exceptions({ :elasticsearch => e })
+          exit 1
+        end
+      end
 
+      # Start web servers
+      server = start_server(info) if @server_port
+
+      # Main loop
+      prev_info = nil
       LPS.interval(@interval).loop do
         info, exceptions =
           begin
@@ -78,26 +96,23 @@ class RedisStat
           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
+        begin
+          output_es info if @elasticsearch && @count > 0
+        rescue Exception => e
+          exceptions[:elasticsearch] = e.to_s
         end
-
+        error_messages = format_exceptions(exceptions)
         info_output = process info, prev_info
-        output_static_info info if @count == 0
-        output info_output, csv
-        server.push @hosts, info, Hash[info_output] if server
+        unless @daemonized
+          output_static_info info if @count == 0
+          output_term info_output, error_messages
+        end
+        server.push @hosts, info, Hash[info_output], error_messages if server
+        output_file info_output, csv if csv
+
         prev_info = info
 
         @count += 1
-        errors = 0
         break if @max_count && @count >= @max_count
       end
       @os.puts
@@ -108,6 +123,8 @@ class RedisStat
         @server_thr.raise Interrupt
         @server_thr.join
       end
+    rescue SystemExit
+      raise
     rescue Exception => e
       @os.puts e.to_s.red.bold
       raise
@@ -118,11 +135,16 @@ class RedisStat
   end
 
 private
-  def start_server
+  def start_server info
     RedisStat::Server.set :port, @server_port
     RedisStat::Server.set :redis_stat, self
-    RedisStat::Server.set :last_info, collect.first
-    @server_thr = Thread.new { RedisStat::Server.run! }
+    RedisStat::Server.set :last_info, info
+    @server_thr = Thread.new {
+      begin
+        RedisStat::Server.run!
+      rescue Interrupt
+      end
+    }
     RedisStat::Server.wait_until_running
     trap('INT') { Thread.main.raise Interrupt }
     RedisStat::Server
@@ -135,7 +157,7 @@ private
     }
     class << info
       def sumf label
-        self[:instances].values.map { |hash| hash[label].to_f }.inject(:+)
+        self[:instances].values.map { |hash| hash[label].to_f }.inject(:+) || 0
       end
     end
     exceptions = {}
@@ -191,6 +213,15 @@ private
     )
   end
 
+  def format_exceptions exceptions
+    if exceptions.empty?
+      []
+    else
+      now = Time.now.strftime('%Y/%m/%d %H:%M:%S')
+      exceptions.map { |h, x| "[#{now}@#{h}] #{x}" }
+    end
+  end
+
   def output_file info_output, file
     file.puts CSV.generate_line(info_output.map { |pair|
       LABELS[pair.first] || pair.first
@@ -202,7 +233,26 @@ private
     file.flush
   end
 
-  def output_term info_output
+  def output_term_errors error_messages
+    @_term_error_reported ||= false
+    if error_messages.empty?
+      @_term_error_reported = false
+    else
+      unless @_term_error_reported
+        @os.puts
+      end
+      output_term_errors! error_messages
+      @_term_error_reported = true
+    end
+  end
+
+  def output_term_errors! error_messages
+    @os.puts error_messages.join($/).red.bold
+  end
+
+  def output_term info_output, error_messages
+    return if output_term_errors error_messages
+
     @table ||= init_table info_output
 
     movement = nil
@@ -265,11 +315,6 @@ private
     @os.puts tab
   end
 
-  def output info_output, file
-    output_term info_output unless @daemonized
-    output_file info_output, file if file
-  end
-
   def output_es info
     @elasticsearch.output info
   rescue Exception

data/lib/redis-stat/elasticsearch.rb

@@ -38,14 +38,15 @@ class ElasticsearchSink
   end
 
   def output info
-    convert_to_i(info).map do |host, entries|
-      time = entries[:at]
+    convert_to_i(info).each do |host, entries|
+      time = info[:at].to_i
       entry = {
         :index => index,
         :type  => "redis",
         :body  => entries.merge({
           :@timestamp => format_time(time),
-          :host       => host
+          :host       => host,
+          :at         => time
         }),
       }
 
@@ -68,15 +69,14 @@ private
   def convert_to_i info
     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
           output[name] = value.to_i
         end
       end
-      [host, output]
-    }]
+      output.empty? ? nil : [host, output]
+    }.compact]
   end
 end
 end

data/lib/redis-stat/server.rb

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

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

@@ -152,7 +152,7 @@ var updateTable = function() {
   for (var stat in js) {
     $("#" + stat).replaceWith(
       "<tr id='" + stat + "'>" +
-      js[stat].map(function(e) { return "<td>" + (e == null ? "" : e) + "</td>" }).join() +
+      js[stat].map(function(e) { return "<td>" + (e == null ? "<span class='label label-warning'>N/A</span>" : e) + "</td>" }).join() +
       "</tr>"
     )
   }

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

@@ -27,7 +27,6 @@
         <div class="span12">
           <h3>Dashboard</h3>
           <div class="alert alert-error hide">
-            <h4></h4>
           </div>
         </div>
       </div>
@@ -142,20 +141,27 @@
 
         var source = new EventSource("/pull")
         source.onmessage = function(e) {
+          var alert = $(".alert");
           var json = JSON.parse(e.data);
-          if (json.error) {
-            $(".alert h4").text(json.error);
-            $(".alert").fadeIn();
-          } else if (appendToHistory(json)) {
-            $(".alert").fadeOut()
+          if (json.error && json.error.length > 0) {
+            alert.html(
+              $.map(json.error, function(e, _) {
+                return "<h4>" + e + "</h4>";
+              }).join(''));
+            alert.fadeIn();
+          } else {
+            alert.fadeOut();
+          }
+          if (appendToHistory(json)) {
             updateTable()
             updatePlot()
           }
         }
         <% unless RUBY_PLATFORM == 'java' %>
         source.onerror = function(e) {
-          $(".alert h4").text("Lost connection to redis-stat");
-          $(".alert").fadeIn();
+          var alert = $(".alert");
+          alert.html("<h4>Lost connection to redis-stat</h4>");
+          alert.fadeIn();
           // source.close()
         }
         <% end %>

data/lib/redis-stat/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redis-stat
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: java
 authors:
 - Junegunn Choi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-07-13 00:00:00.000000000 Z
+date: 2014-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi256
@@ -224,7 +224,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.1.9
+rubygems_version: 2.2.2
 signing_key:
 specification_version: 4
 summary: A real-time Redis monitoring tool written in Ruby