redisrpc 0.3.3 → 0.3.4

data/lib/redisrpc.rb

@@ -24,6 +24,10 @@ module RedisRPC
     end
 
 
+    class TimeoutException<Exception
+    end
+
+
     class FunctionCall
 
         def initialize(args={})
@@ -45,22 +49,26 @@ module RedisRPC
 
     class Client
 
-        def initialize(redis_server, input_queue)
+        def initialize(redis_server, message_queue, timeout=0)
             @redis_server = redis_server
-            @input_queue = input_queue
+            @message_queue = message_queue
+            @timeout = timeout
         end
 
         def method_missing(sym, *args, &block)
             function_call = {'name' => sym.to_s, 'args' => args}
-            response_queue = @input_queue + ':rpc:' + rand_string
+            response_queue = @message_queue + ':rpc:' + rand_string
             rpc_request = {'function_call' => function_call, 'response_queue' => response_queue}
             message = JSON.generate rpc_request
             if $DEBUG
                 $stderr.puts 'RPC Request: ' + message
             end
-            @redis_server.rpush @input_queue, message
-            timeout_s = 0 # Block forever.
-            message_queue, message = @redis_server.blpop response_queue, timeout_s
+            @redis_server.rpush @message_queue, message
+            result = @redis_server.blpop response_queue, @timeout
+            if result.nil?
+                raise TimeoutException
+            end
+            message_queue, message = result
             if $DEBUG
                 if message_queue != response_queue
                     fail 'assertion failed'
@@ -91,17 +99,19 @@ module RedisRPC
 
     class Server
 
-        def initialize(redis_server, input_queue, local_object)
+        def initialize(redis_server, message_queue, local_object)
             @redis_server = redis_server
-            @input_queue = input_queue
+            @message_queue = message_queue
             @local_object = local_object
         end
 
         def run
+            # Flush the message queue.
+            @redis_server.del @message_queue
             loop do
-                message_queue, message = @redis_server.blpop @input_queue, 0
+                message_queue, message = @redis_server.blpop @message_queue, 0
                 if $DEBUG
-                    fail 'assertion failed' if message_queue != @input_queue
+                    fail 'assertion failed' if message_queue != @message_queue
                     $stderr.puts 'RPC Request: ' + message
                 end
                 rpc_request = JSON.parse(message)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redisrpc
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-03 00:00:00.000000000 Z
+date: 2012-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &2151871000 !ruby/object:Gem::Requirement
+  requirement: &2151801000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - <
@@ -21,7 +21,7 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2151871000
+  version_requirements: *2151801000
 description: ! 'RedisRPC is the easiest to use RPC library in the world. (No small
   claim!) It
 
@@ -43,7 +43,7 @@ description: ! 'RedisRPC is the easiest to use RPC library in the world. (No sma
 
   Many other RPC mechanisms are either programming language specific (e.g.
 
-  JavaRMI or require boiler-plate code for explicit typing (e.g.  Thrift).
+  Java RMI) or require boiler-plate code for explicit typing (e.g. Thrift).
 
   RedisRPC was designed to be extremely easy to use by eliminating boiler-plate