redis-stat 0.3.8-java → 0.3.9-java

data/lib/redis-stat.rb

@@ -81,6 +81,7 @@ class RedisStat
             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
@@ -116,6 +117,7 @@ private
   def start_server
     RedisStat::Server.set :port, @server_port
     RedisStat::Server.set :redis_stat, self
+    RedisStat::Server.set :last_info, info
     @server_thr = Thread.new { RedisStat::Server.run! }
     RedisStat::Server.wait_until_running
     trap('INT') { Thread.main.raise Interrupt }

data/lib/redis-stat/server.rb

@@ -1,6 +1,7 @@
 require 'sinatra/base'
 require 'json'
 require 'thread'
+require 'set'
 
 class RedisStat
 class Server < Sinatra::Base
@@ -17,19 +18,36 @@ class Server < Sinatra::Base
     end
     set :environment, :production
     set :root, File.join( File.dirname(__FILE__), 'server' )
-    set :clients, []
-    set :history, []
     set :mutex, Mutex.new
+
+    set :clients,    Set.new
+    set :history,    []
+    set :last_error, nil
+  end
+
+  helpers do
+    def sync
+      settings.mutex.synchronize { yield }
+    end
+  end
+
+  not_found do
+    redirect '/'
   end
 
   get '/' do
-    @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
+    redis_stat    = settings.redis_stat
+    @hosts        = redis_stat.hosts
+    @measures     = redis_stat.measures
+    @tab_measures = redis_stat.tab_measures
+    @interval     = redis_stat.interval
+    @verbose      = redis_stat.verbose ? 'verbose' : ''
+    @history      = sync { settings.history.dup }
+
+    info = redis_stat.info rescue nil
+    sync do
+      @info = info ? (settings.last_info = info) : settings.last_info
+    end
     erb :index
   end
 
@@ -37,13 +55,23 @@ class Server < Sinatra::Base
     content_type 'text/event-stream'
 
     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
+      data =
+        sync {
+          if settings.last_error
+            { :error => settings.last_error }
+          elsif last = settings.history.last
+            last
+          else
+            {}
+          end
+        }.to_json
+      body "retry: #{settings.redis_stat.interval * 900}\ndata: #{data}\n\n"
     else
       stream(:keep_open) do |out|
-        settings.clients << out
-        out.callback { settings.clients.delete out }
+        sync do
+          settings.clients << out
+          out.callback { settings.clients.delete out }
+        end
       end
     end
   end
@@ -61,16 +89,29 @@ class Server < Sinatra::Base
       }]
       data = {:at => (Time.now.to_f * 1000).to_i, :static => static, :dynamic => data}
 
-      hist = settings.history
       settings.mutex.synchronize do
+        settings.last_error = nil
+        hist = settings.history
         hist << data
         hist.shift if hist.length > HISTORY_LENGTH
       end
+      publish data
+    end
+
+    def alert error
+      settings.mutex.synchronize do
+        settings.last_error = error
+      end
+      publish({ :error => error })
+    end
 
-      return if settings.clients.empty?
+  private
+    def publish data
+      clients = settings.mutex.synchronize { settings.clients.dup }
+      return if clients.empty?
 
       resp = "data: #{data.to_json}\n\n"
-      settings.clients.each do |cl|
+      clients.each do |cl|
         cl << resp
       end
     end

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

@@ -26,11 +26,9 @@
       <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>
+            <h4></h4>
           </div>
-          <% end %>
         </div>
       </div>
 
@@ -144,16 +142,23 @@
 
         var source = new EventSource("/pull")
         source.onmessage = function(e) {
-          if (appendToHistory(JSON.parse(e.data))) {
+          var json = JSON.parse(e.data);
+          if (json.error) {
+            $(".alert h4").text(json.error);
+            $(".alert").fadeIn();
+          } else if (appendToHistory(json)) {
             $(".alert").fadeOut()
             updateTable()
             updatePlot()
           }
         }
+        <% unless RUBY_PLATFORM == 'java' %>
         source.onerror = function(e) {
-          $(".alert").fadeIn()
+          $(".alert h4").text("Lost connection to redis-stat");
+          $(".alert").fadeIn();
           // source.close()
         }
+        <% end %>
       })
     </script>
   </body>

data/lib/redis-stat/version.rb

@@ -1,3 +1,3 @@
 class RedisStat
-  VERSION = "0.3.8"
+  VERSION = "0.3.9"
 end

data/test/test_redis-stat.rb

@@ -104,9 +104,6 @@ class TestRedisStat < Test::Unit::TestCase
 
     # Server
     if RUBY_PLATFORM == 'java'
-      assert_raise(SystemExit) {
-        RedisStat::Option.parse(%w[-h localhost:8888 10 -a password --csv=/tmp/a.csv --style=ascii --server=5555])
-      }
       assert_raise(SystemExit) {
         RedisStat::Option.parse(%w[-h localhost:8888 10 -a password --csv=/tmp/a.csv --style=ascii --server=5555 --daemon])
       }

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: redis-stat
 version: !ruby/object:Gem::Version
-  version: 0.3.8
   prerelease:
+  version: 0.3.9
 platform: java
 authors:
 - Junegunn Choi
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi256