arya-pandemic 0.3.3 → 0.3.4

data/README.markdown

@@ -117,9 +117,11 @@ The servers are going to try to bind to localhost:4000 and localhost:4001 so mak
 By default, the handler runs in the same Ruby process as Pandemic. By setting the fork\_for\_processor to true in pandemic\_server.yml, you can have Pandemic fork to new processes to run the process method. This is particularly useful when your process method goes to MySQL which locks the entire process until MySQL returns.
 
 ## Change History
-Version 0.3.1
+**Version 0.3.1**
+
  * Changed map to partition to more accurately reflect what it does. This breaks backwards compatibility, but all you have to do is rename your method.
-Version 0.3.0
+
+**Version 0.3.0**
 
  * Pandemic can now fork to call the process method
  * Pandemic server now expects a class instead of a instance of the handler when booting the server, it will call the initializer method once per process.

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('pandemic', '0.3.3') do |p|
+Echoe.new('pandemic', '0.3.4') do |p|
   p.description    = "Distribute MapReduce to any of the workers and it will spread, like a pandemic."
   p.url            = "https://github.com/arya/pandemic/"
   p.author         = "Arya Asemanfar"

data/lib/pandemic/client_side/cluster_connection.rb

@@ -40,7 +40,8 @@ module Pandemic
         @connection_proxies[key]
       end
       
-      def request(body, key = nil, options = {})
+      def request(body, key = nil, options = nil)
+        key, options = nil, key if key.is_a?(Hash)
         with_connection(key) do |socket|
           begin
             flags = []

data/lib/pandemic/server_side/client.rb

@@ -12,7 +12,7 @@ module Pandemic
         @connection = connection
         @server = server
         @received_requests = 0
-        @responded_requests = 0
+        @responded_requests = MutexCounter.new                                                             
         @current_request = nil
       end
     
@@ -38,7 +38,10 @@ module Pandemic
                   body = @connection.read(size)
                   debug("Finished reading request body")
                   if flags.include?(REQUEST_FLAGS[:async])
-                    Thread.new { handle_request(body) }
+                    Thread.new do
+                      handle_request(body)
+                      @responded_requests.inc
+                    end
                   else
                     response = handle_request(body)
                   
@@ -48,8 +51,8 @@ module Pandemic
                     @connection.write("#{response.size}\n#{response}")
                     @connection.flush
                     debug("Finished writing response to client")
+                    @responded_requests.inc
                   end
-                  @responded_requests += 1
                 end
               end
             rescue DisconnectClient

data/lib/pandemic/server_side/server.rb

@@ -237,7 +237,7 @@ module Pandemic
         results[:late_responses] = Request.total_late_responses
         results[:pending_requests] = @clients_mutex.synchronize do
           @clients.inject(0) do |pending, client|
-            pending + (client.received_requests - client.responded_requests)
+            pending + (client.received_requests - client.responded_requests.to_i)
           end
         end
         

data/pandemic.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pandemic}
-  s.version = "0.3.3"
+  s.version = "0.3.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Arya Asemanfar"]
-  s.date = %q{2009-06-18}
+  s.date = %q{2009-06-21}
   s.description = %q{Distribute MapReduce to any of the workers and it will spread, like a pandemic.}
   s.email = %q{aryaasemanfar@gmail.com}
   s.extra_rdoc_files = ["lib/pandemic/client_side/cluster_connection.rb", "lib/pandemic/client_side/config.rb", "lib/pandemic/client_side/connection.rb", "lib/pandemic/client_side/connection_proxy.rb", "lib/pandemic/client_side/pandemize.rb", "lib/pandemic/connection_pool.rb", "lib/pandemic/mutex_counter.rb", "lib/pandemic/server_side/client.rb", "lib/pandemic/server_side/config.rb", "lib/pandemic/server_side/handler.rb", "lib/pandemic/server_side/peer.rb", "lib/pandemic/server_side/processor.rb", "lib/pandemic/server_side/request.rb", "lib/pandemic/server_side/server.rb", "lib/pandemic/util.rb", "lib/pandemic.rb", "README.markdown"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: arya-pandemic
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Arya Asemanfar
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-18 00:00:00 -07:00
+date: 2009-06-21 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency