x_runtime 0.5.0 → 0.7.0

data/README.markdown

@@ -13,7 +13,8 @@ XRuntime是一个Rack的middleware,配合Redis用来分析Http Server每个URI
 * 最近一次请求时间
 * 平均请求时间
 
-当请求积累到50次后，通过pipeline机制一次将数据插入Redis,避免每次请求都访问一下Redis.
+当请求积累到50次后，通过pipeline机制一次将数据插入Redis,避免每次请求都访问一下Redis.   
+引入了缓存超时机制后，当上一次将缓存写入时间和最新一次请求时间查过expire秒后，则将缓存写入Redis.
 
 ## Portal
 
@@ -22,14 +23,15 @@ XRuntime是一个Rack的middleware,配合Redis用来分析Http Server每个URI
 
 ## Usage
 
-引入这个middleware需要两个参数:
+引入这个middleware需要的参数:
 
 1. redis对象
-2. :threshold,表示处理时间超过多少毫秒的请求才会被记录
-3. :cache,表示请求积累到多少条的时候才通过redis的pipeline机制插入到redis数据库中
+2. :threshold,表示处理时间超过多少毫秒的请求才会被记录,默认100毫秒
+3. :cache,表示请求积累到多少条的时候才通过redis的pipeline机制插入到redis数据库中,默认50
+4. :expire,如果上一次写入Redis和这次请求相差时间大于expire，则在本次请求时也将缓存数据写入Redis,默认120秒
 
 可以指定XRuntime使用的Redis的key前缀或者叫命名空间:    
-`XRuntime::NameSpace = "RuntimeEx::Threshold"`  
+`XRuntime::NameSpace = "XRuntime::Threshold"`  
 
 ### Server
 
@@ -41,6 +43,8 @@ XRuntime::Server.use(Rack::Auth::Basic) do |user, password|
 end
 ```
 
+增加一个子页面`/incache`,可以查看缓存中没有插入Redis的数据，但要记得这些缓存数据是在每个Server各自的进程中保存，每次访问这个页面，得到的缓存数据只代表该进程正在缓存的数据。
+
 ### Sinatra
 
 收集数据 `config.ru`:  

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.7.0

data/lib/x_runtime/data_set.rb

@@ -1,7 +1,8 @@
 module XRuntime
   class DataSet
+    attr_accessor :data
     
-    def initialize(key, script, count)
+    def initialize(key, script, count, expire)
       raise ArgumentError, "Script must not nil and be valid!" unless script
       @key = key
       @key_counter = "#{@key}::Counter"
@@ -9,6 +10,8 @@ module XRuntime
       @key_average = "#{@key}::Average"
       @script = script
       @count = count
+      @expire = expire
+      @expired_at = Time.now.to_i
       # 预先加载Lua脚本
       @script.sha
       @data = []
@@ -46,7 +49,9 @@ module XRuntime
     def add(member, score)
       @data.push([member, score])
       # 如果@data数据达到一定数量，则一起插入redis
-      if @data.size >= @count
+      # 如果上一次写入Redis和这次请求相差时间大于@expire，则在本次请求时也将缓存数据写入Redis
+      if (@data.size >= @count) or (Time.now.to_i - @expired_at >= @expire)
+        @expired_at = Time.now.to_i
         @script.redis.multi do
           while (data = @data.pop) do
             @script.evalsha([@key], [data[0], data[1]])

data/lib/x_runtime/middleware.rb

@@ -5,14 +5,15 @@ module XRuntime
     def initialize(app, redis, opts = {})
       @app = app
       @redis = redis
-      opts = {:threshold => 100.0, :cache => 50}.update opts
+      opts = {:threshold => 100.0, :cache => 50, :expire => 120}.update opts
       @cache = opts[:cache].to_i
+      @expire = opts[:expire].to_i
       @threshold = opts[:threshold].to_f
       XRuntime.middleware = self
     end
     
     def ds
-      @ds ||= DataSet.new(redis_key, script, @cache)
+      @ds ||= DataSet.new(redis_key, script, @cache, @expire)
     end
     
     def script

data/lib/x_runtime/server.rb

@@ -6,9 +6,25 @@ end
 
 module XRuntime
   class Server < Sinatra::Base    
+    
+    before do
+      halt("Need use Rack::XRuntime first") unless XRuntime.middleware
+    end
+    
     get '/' do
       @req = Rack::Request.new(env)
       Template.new(XRuntime.middleware.ds, :limit => (@req.params["limit"] ? @req.params["limit"].to_i : 20), :offset => @req.params["offset"].to_i).render
     end
+    
+    get '/incache' do
+      {
+        :status => 0, 
+        :msg => "data in cache.", 
+        :data => {
+          :count => XRuntime.middleware.ds.data.size,
+          :data => XRuntime.middleware.ds.data
+        }
+      }.to_json
+    end
   end
 end

data/lib/x_runtime.rb

@@ -7,7 +7,7 @@ require "fileutils"
 $:.unshift(File.dirname(__FILE__))
 
 module XRuntime
-  NameSpace     = "RuntimeEx::Threshold"
+  NameSpace     = "XRuntime::Threshold"
   extend        self
   attr_accessor :middleware
   

data/test/server.ru

@@ -8,7 +8,7 @@ require "#{File.dirname(__FILE__)}/../lib/x_runtime"
 class Server < Sinatra::Base
   # use XRuntime::Middleware, 10, Redis.connect(:url => "redis://localhost:6380/")
   # XRuntime::Middleware is same as Rack::XRuntime
-  use Rack::XRuntime, Redis.connect(:url => "redis://localhost:6379/"), :threshold => 50.0, :cache => 50
+  use Rack::XRuntime, Redis.connect(:url => "redis://localhost:6379/"), :threshold => 50.0, :cache => 50, :expire => 60
 
   get /.*/ do
     # sleep(1)

data/x_runtime.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "x_runtime"
-  s.version = "0.5.0"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["\u{5d14}\u{5ce5}"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: x_runtime
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -135,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1119447801023194543
+      hash: 1552083409244175477
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: