arya-pandemic 0.5.1 → 0.5.2

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('pandemic', '0.5.1') do |p|
+Echoe.new('pandemic', '0.5.2') do |p|
   p.description    = "A framework for distributing work for real-time services and offline tasks."
   p.url            = "https://github.com/arya/pandemic/"
   p.author         = "Arya Asemanfar"

data/lib/pandemic/server_side/peer.rb

@@ -15,12 +15,12 @@ module Pandemic
       end
       
       def connect
-        debug("Forced connection to peer")
+        # debug("Forced connection to peer")
         @connection_pool.connect
       end
       
       def disconnect
-        debug("Disconnecting from peer")
+        # debug("Disconnecting from peer")
         @connection_pool.disconnect
       end
       
@@ -31,29 +31,41 @@ module Pandemic
       def client_request(request, body)
         # debug("Sending client's request to peer")
         # debug("Connection pool has #{@connection_pool.available_count} of #{@connection_pool.connections_count} connections available")
-        # TODO: Consider adding back threads here if it will be faster that way in Ruby 1.9
-        @connection_pool.with_connection do |connection|
-          if connection && !connection.closed?
-            @pending_requests.synchronize do
-              @pending_requests[request.hash] = request
+
+        successful = true
+        @pending_requests.synchronize do
+          @pending_requests[request.hash] = request
+        end
+        begin
+          @connection_pool.with_connection do |connection|
+            if connection && !connection.closed?
+              # debug("Writing client's request")
+              connection.write("PROCESS #{request.hash} #{body.size}\n#{body}")
+              connection.flush
+              # debug("Finished writing client's request")
+            else
+              successful = false
             end
-            # debug("Writing client's request")
-            connection.write("PROCESS #{request.hash} #{body.size}\n#{body}")
-            connection.flush
-            # debug("Finished writing client's request")
-          end # TODO: else? fail silently? reconnect?
+          end
+        rescue Exception
+          @pending_requests.synchronize { @pending_requests.delete(request.hash) }
+          raise
+        else
+          if !successful
+            @pending_requests.synchronize { @pending_requests.delete(request.hash) }
+          end
         end
       end
     
       def add_incoming_connection(conn)
-        debug("Adding incoming connection")
+        # debug("Adding incoming connection")
 
         connect # if we're not connected, we should be
 
         
         thread = Thread.new(conn) do |connection|
           begin
-            debug("Incoming connection thread started")
+            # debug("Incoming connection thread started")
             while @server.running
               # debug("Listening for incoming requests")
               request = connection.gets
@@ -71,7 +83,7 @@ module Pandemic
           rescue Exception => e
             warn("Unhandled exception in peer listener thread:\n#{e.inspect}\n#{e.backtrace.join("\n")}")
           ensure
-            debug("Incoming connection closing")
+            # debug("Incoming connection closing")
             conn.close if conn && !conn.closed?
             @inc_threads_mutex.synchronize { @incoming_connection_listeners.delete(Thread.current)}
             if @incoming_connection_listeners.empty?
@@ -95,9 +107,9 @@ module Pandemic
             connection = TCPSocket.new(@host, @port)
           rescue Errno::ETIMEDOUT, Errno::ECONNREFUSED => e
             connection = nil
-            debug("Connection timeout or refused: #{e.inspect}")
+            # debug("Connection timeout or refused: #{e.inspect}")
             if retries == 0
-              debug("Retrying connection")
+              # debug("Retrying connection")
               retries += 1
               sleep 0.01
               retry

data/pandemic.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{pandemic}
-  s.version = "0.5.1"
+  s.version = "0.5.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Arya Asemanfar"]
-  s.date = %q{2009-08-09}
+  s.date = %q{2009-08-11}
   s.description = %q{A framework for distributing work for real-time services and offline tasks.}
   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/requests_per_second.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"]

data/test/client_test.rb

@@ -6,15 +6,20 @@ class ClientTest < Test::Unit::TestCase
   context "with a client object" do
     setup do
       @server = mock()
-      @server.expects(:running).returns(true).then.returns(false)
+      @server.stubs(:client_closed)
+      @server.stubs(:handle_client_request)
+      @server.expects(:running).at_least_once.returns(true).then.returns(false)
       @connection = mock()
-      @connection.expects(:peeraddr).returns(['','','',''])
+      @connection.stubs(:write)
+      @connection.stubs(:flush)
+      @connection.stubs(:peeraddr).returns(['','','',''])
       @connection.expects(:nil?).returns(false).at_least_once
       @client = Pandemic::ServerSide::Client.new(@connection, @server)
     end
     
     should "read size from the connection" do
       @connection.expects(:gets).returns("5\n")
+      @connection.expects(:read).with(5)
       @server.expects(:client_closed).with(@client)
       @client.listen
       wait_for_threads
@@ -34,7 +39,9 @@ class ClientTest < Test::Unit::TestCase
       
       request = mock()
       Pandemic::ServerSide::Request.expects(:new).returns(request)
-      @server.expects(:handle_client_request).with(request)
+      @server.expects(:handle_client_request).with(request).returns(nil)
+      @connection.stubs(:write)
+      @connection.stubs(:flush)
       
       @server.expects(:client_closed).with(@client)
       @client.listen    

data/test/peer_test.rb

@@ -34,7 +34,7 @@ class PeerTest < Test::Unit::TestCase
     
     should "send client request to peer connection" do
       request, body = stub(:hash => "asdasdfadsf"), "hello world"
-      @connection_pool.expects(:available_count => 1, :connections_count => 1)
+      @connection_pool.stubs(:available_count => 1, :connections_count => 1)
       conn = mock()
       @connection_pool.expects(:with_connection).yields(conn)
       

data/test/server_test.rb

@@ -14,9 +14,11 @@ class ServerTest < Test::Unit::TestCase
       @tcpserver = mock()
       TCPServer.expects(:new).with("localhost", 4000).returns(@tcpserver)
       
-      @conn = mock(:peeraddr => ['','','',''])
+      @conn = mock()
+      @conn.stubs(:peeraddr => ['','','',''])
       @tcpserver.expects(:accept).twice.returns(@conn).then.raises(Pandemic::ServerSide::Server::StopServer)
       peer = mock()
+      peer.stubs(:add_incoming_connection)
       @conn.expects(:setsockopt).with(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
       
       @conn.expects(:gets).returns("SERVER localhost:4001\n")
@@ -91,7 +93,8 @@ class ServerTest < Test::Unit::TestCase
       TCPServer.expects(:new).with("localhost", 4000).returns(@tcpserver)
       @peer.expects(:connect).once
       
-      @conn = mock(:peeraddr => ['','','',''])
+      @conn = mock()
+      @conn.stubs(:peeraddr => ['','','',''])
       @tcpserver.expects(:accept).twice.returns(@conn).then.raises(Pandemic::ServerSide::Server::StopServer)
       client = mock()
       @conn.expects(:setsockopt).with(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, 1)
@@ -115,7 +118,8 @@ class ServerTest < Test::Unit::TestCase
       TCPServer.expects(:new).with("localhost", 4000).returns(@tcpserver)
       @peer.expects(:connect).once
       
-      @conn = mock(:peeraddr => ['','','',''])
+      @conn = mock()
+      @conn.stubs(:peeraddr => ['','','',''])
       @tcpserver.expects(:accept).twice.returns(@conn).then.raises(Pandemic::ServerSide::Server::StopServer)
       @tcpserver.expects(:close)
       @peer.expects(:disconnect)
@@ -146,7 +150,7 @@ class ServerTest < Test::Unit::TestCase
       handler = mock()
       handler_class.expects(:new).once.returns(handler)
       request = mock()
-      request.expects(:hash).at_least_once.returns("abcddef134123")
+      request.stubs(:hash => "abcddef134123")
       @peer.expects(:connected?).returns(true)
       handler.expects(:partition).with(request, is_a(Hash)).returns({"localhost:4000" => "1", "localhost:4001" => "2"})
       request.expects(:max_responses=).with(2)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: arya-pandemic
 version: !ruby/object:Gem::Version 
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors: 
 - Arya Asemanfar
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-09 00:00:00 -07:00
+date: 2009-08-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency