em-riak 0.2.91 → 0.2.92

data/em-riak.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
     s.name        = 'em-riak'
-    s.version     = '0.2.91'
-    s.date        = '2013-03-08'
+    s.version     = '0.2.92'
+    s.date        = '2013-03-09'
     s.summary     = "Riak client for eventmachine"
     s.description = "An extremely fast and convenient riak client for eventmachine."
     s.authors     = ["Von"]

data/lib/em-riak/basic.rb

@@ -168,9 +168,12 @@ module EmRiak
             
             data[:query]="?returnbody=true"
             request_options=data.reject{|k,v| k==:retry} #request options, reject some data before submit
+            request_options.merge({ :connect_timeout => EM_REQUEST_TIMEOUT, :inactivity_timeout => EM_INACTIVITY_TIMEOUT, :keepalive=>true})
+            #:connect_timeout => EM_REQUEST_TIMEOUT, :inactivity_timeout => EM_INACTIVITY_TIMEOUT,
+
             path_result=generate_path(url)
             execute_url  = path_result[:url]
-            host = path_result[:host]
+            host = path_result[:host]            
 
             # == Start
             # These lines should reduce high em-http recreate cost. (especially if we create ssl conn)
@@ -180,16 +183,16 @@ module EmRiak
             raise "do it later because pool full" if EmRiak.em_enqueue_pool[host][:working].count>=EmRiak.em_enqueue_pool_max
 
             if EmRiak.em_enqueue_pool[host][:alives].count<1 
-                enqueue=EventMachine::HttpRequest.new(execute_url,{:keepalive=>true}) # keepalive will make all connections alive, so we can avoid heavy cpu load when large amount em_http instance create
+                enqueue=EventMachine::HttpRequest.new(execute_url,{ :connect_timeout => EM_REQUEST_TIMEOUT, :inactivity_timeout => EM_INACTIVITY_TIMEOUT, :keepalive=>true}) # keepalive will make all connections alive, so we can avoid heavy cpu load when large amount em_http instance create
                 EmRiak.em_enqueue_pool[host][:working].push(enqueue)
             else
                 enqueue=EmRiak.em_enqueue_pool[host][:alives].pop
                 EmRiak.em_enqueue_pool[host][:working].push(enqueue)
             end
             # == End
-
+            
             # Do job
-            riakHttp = enqueue.send method.to_sym , :connect_timeout => EM_REQUEST_TIMEOUT, :inactivity_timeout => EM_INACTIVITY_TIMEOUT, :keepalive=>true
+            riakHttp = enqueue.send method.to_sym , :keepalive=>true, :head=>data[:head], :body=>data[:body], :query=>data[:query] #, request_options
             riakHttp.errback{ # Error Callback
                 puts "#{method} - #{key} - riak callback error #{riakHttp.response}" if EmRiak.debug
                 data[:retry]+=1

data/lib/em-riak/map_reduce.rb

@@ -26,6 +26,7 @@ module EmRiak
                 submit_work=eval(submit_work)
             end
             url="/mapred"
+
             map_reduce_json=EmRiak.send :json_encode ,submit_work
             data={:head=>{"Content-Type"=>"application/json"},:body=>map_reduce_json}
             

data/lib/em-riak/version.rb

@@ -1,3 +1,3 @@
 module EmRiak
-    VERSION = "0.2.91"
+    VERSION = "0.2.92"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: em-riak
 version: !ruby/object:Gem::Version
-  version: 0.2.91
+  version: 0.2.92
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-08 00:00:00.000000000Z
+date: 2013-03-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape_utils
-  requirement: &70281193511080 !ruby/object:Gem::Requirement
+  requirement: &70326827416060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70281193511080
+  version_requirements: *70326827416060
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70281193510640 !ruby/object:Gem::Requirement
+  requirement: &70326827415620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70281193510640
+  version_requirements: *70326827415620
 - !ruby/object:Gem::Dependency
   name: httpi
-  requirement: &70281193510220 !ruby/object:Gem::Requirement
+  requirement: &70326827414820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70281193510220
+  version_requirements: *70326827414820
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70281193509800 !ruby/object:Gem::Requirement
+  requirement: &70326827414400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70281193509800
+  version_requirements: *70326827414400
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70281193509380 !ruby/object:Gem::Requirement
+  requirement: &70326827413860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70281193509380
+  version_requirements: *70326827413860
 description: An extremely fast and convenient riak client for eventmachine.
 email: von@vonstark.co
 executables: []