x_runtime 0.4.1 → 0.5.0

data/Gemfile

@@ -1,4 +1,5 @@
 source "http://ruby.taobao.org"
+source "http://gems.github.com/"
 gem 'rack'
 gem 'rake'
 gem 'jeweler'

data/Gemfile.lock

@@ -1,5 +1,6 @@
 GEM
   remote: http://ruby.taobao.org/
+  remote: http://gems.github.com/
   specs:
     git (1.2.5)
     jeweler (1.8.4)
@@ -7,7 +8,7 @@ GEM
       git (>= 1.2.5)
       rake
       rdoc
-    json (1.7.5)
+    json (1.7.4)
     rack (1.4.1)
     rack-protection (1.2.0)
       rack
@@ -15,7 +16,7 @@ GEM
     rdoc (3.12)
       json (~> 1.4)
     redis (3.0.1)
-    sinatra (1.3.3)
+    sinatra (1.3.2)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)

data/README.markdown

@@ -24,8 +24,9 @@ XRuntime是一个Rack的middleware,配合Redis用来分析Http Server每个URI
 
 引入这个middleware需要两个参数:
 
-1. threshold,表示处理时间超过多少毫秒的请求才会被记录
-2. redis对象
+1. redis对象
+2. :threshold,表示处理时间超过多少毫秒的请求才会被记录
+3. :cache,表示请求积累到多少条的时候才通过redis的pipeline机制插入到redis数据库中
 
 可以指定XRuntime使用的Redis的key前缀或者叫命名空间:    
 `XRuntime::NameSpace = "RuntimeEx::Threshold"`  
@@ -33,17 +34,19 @@ XRuntime是一个Rack的middleware,配合Redis用来分析Http Server每个URI
 ### Server
 
 可以通过自带的Http页面查看请求数据，这些页面可以设置Http basic auth验证以保护起来	 
-只要在加载XRuntime::Server的时候，传递一个proc作为认证条件即可   
-可以在配置url路由的时候指定XRuntime::Server的挂载路径，然后就可以通过该路径访问页面   
+
+``` ruby
+XRuntime::Server.use(Rack::Auth::Basic) do |user, password|
+  user == 'cui' && password == "hello"
+end
+```
 
 ### Sinatra
 
 收集数据 `config.ru`:  
 
 ``` ruby
-use Rack::XRuntime, 10, Redis.connect(:url => "redis://localhost:6379/") do |name, password|
-  name == "cui" and password == "hello"
-end
+use Rack::XRuntime, Redis.connect(:url => "redis://localhost:6379/"), :threshold => 100.0, :cache => 50
 ```
 
 查看数据 `config.ru`:  
@@ -59,15 +62,13 @@ run Rack::URLMap.new \
 收集数据 `config/environment.rb`:   
 
 ``` ruby
-config.middleware.insert_after Rack::Runtime, Rack::XRuntime, 100, Redis.connect(:url => "redis://localhost:6380/") do |name, password|
-  name == "cui" and password == "hello"
-end
+config.middleware.use Rack::XRuntime, Redis.connect(:url => "redis://localhost:6380/"), :threshold => 100.0, :cache => 50
 ```
 
 查看数据 `config/routes.rb`:   
 
 ``` ruby
-mount Rack::XRuntime, :at => "/xruntime"
+mount XRuntime::Server, :at => "/xruntime"
 ```
 
 ### Test

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.5.0

data/lib/x_runtime/data_set.rb

@@ -1,13 +1,14 @@
 module XRuntime
   class DataSet
     
-    def initialize(key, script)
+    def initialize(key, script, count)
       raise ArgumentError, "Script must not nil and be valid!" unless script
       @key = key
       @key_counter = "#{@key}::Counter"
       @key_amount = "#{@key}::Amount"
       @key_average = "#{@key}::Average"
       @script = script
+      @count = count
       # 预先加载Lua脚本
       @script.sha
       @data = []
@@ -45,7 +46,7 @@ module XRuntime
     def add(member, score)
       @data.push([member, score])
       # 如果@data数据达到一定数量，则一起插入redis
-      if @data.size >= 50
+      if @data.size >= @count
         @script.redis.multi do
           while (data = @data.pop) do
             @script.evalsha([@key], [data[0], data[1]])

data/lib/x_runtime/middleware.rb

@@ -2,16 +2,17 @@ module XRuntime
   class Middleware
     attr_accessor :auth
     # threshold => ms
-    def initialize(app, threshold, redis, &auth)
+    def initialize(app, redis, opts = {})
       @app = app
-      @threshold = threshold.to_f
       @redis = redis
-      @auth = auth
+      opts = {:threshold => 100.0, :cache => 50}.update opts
+      @cache = opts[:cache].to_i
+      @threshold = opts[:threshold].to_f
       XRuntime.middleware = self
     end
     
     def ds
-      @ds ||= DataSet.new(redis_key, script)
+      @ds ||= DataSet.new(redis_key, script, @cache)
     end
     
     def script
@@ -26,7 +27,6 @@ module XRuntime
       start_time = Time.now
       status, headers, body = @app.call(env)
       request_time = (Time.now - start_time).to_f*1000
-
       if request_time >= @threshold
         logredis(request_time, env['REQUEST_URI']) rescue nil
       end

data/lib/x_runtime/server.rb

@@ -1,15 +1,14 @@
+require "sinatra/base"
+
+if defined? Encoding
+  Encoding.default_external = Encoding::UTF_8
+end
+
 module XRuntime
-  class Server
-    def initialize(app=nil)
-      @server = lambda {|env|
-        @req = Rack::Request.new(env)
-        [200, {'Content-Type' => 'text/html'}, [Template.new(XRuntime.middleware.ds, :limit => (@req.params["limit"] ? @req.params["limit"].to_i : 20), :offset => @req.params["offset"].to_i).render]]
-      }
-      @server = Rack::Auth::Basic.new(@server, &XRuntime.middleware.auth) if XRuntime.middleware.auth
-    end
-        
-    def call(env)
-      @server.call(env)
+  class Server < Sinatra::Base    
+    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
   end
-end
+end

data/lib/x_runtime/template.rb

@@ -1,3 +1,5 @@
+require "erb"
+
 module XRuntime
   class Template
     def initialize(ds, opts={})

data/test/server.ru

@@ -4,13 +4,11 @@ require "sinatra/base"
 require "#{File.dirname(__FILE__)}/../lib/x_runtime"
 
 # redis-server version must > 2.6.0 for lua script.
-
+ 
 class Server < Sinatra::Base
   # use XRuntime::Middleware, 10, Redis.connect(:url => "redis://localhost:6380/")
   # XRuntime::Middleware is same as Rack::XRuntime
-  use Rack::XRuntime, 10, Redis.connect(:url => "redis://localhost:6379/") do |name, password|
-    name == "cui" and password == "hello"
-  end
+  use Rack::XRuntime, Redis.connect(:url => "redis://localhost:6379/"), :threshold => 50.0, :cache => 50
 
   get /.*/ do
     # sleep(1)

data/x_runtime.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "x_runtime"
-  s.version = "0.4.1"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["\u{5d14}\u{5ce5}"]
-  s.date = "2012-08-21"
+  s.date = "2012-08-22"
   s.description = "\u{7531}\u{4e8e}\u{4f7f}\u{7528}\u{5230}Redis\u{7684}lua script,\u{6240}\u{4ee5}\u{9700}\u{8981}\u{4f60}\u{7684}Redis\u{670d}\u{52a1}\u{652f}\u{6301},redis-server\u{7248}\u{672c}>2.6.x,redis(ruby gem)>3.0.1."
   s.email = "zheng.cuizh@gmail.com"
   s.extra_rdoc_files = [

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: x_runtime
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-21 00:00:00.000000000 Z
+date: 2012-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -135,7 +135,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2051941527554950884
+      hash: -1119447801023194543
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: