Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ruby/Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
redisrpc (0.3.4)
redisrpc (0.3.5)
multi_json (~> 1.3)
redis

Expand Down
28 changes: 21 additions & 7 deletions ruby/lib/redisrpc.rb
Original file line number Diff line number Diff line change
Expand Up @@ -81,11 +81,18 @@ def rand_string(size=8)
end

class Server
def initialize( redis_server, message_queue, local_object, timeout=nil )
# Legacy: Server.new( redis_server, queue, local_object, timeout )
# Current: Server.new( redis_server, { queue => local_object }, timeout )
def initialize( redis_server, *args )
@redis_server = redis_server
@message_queue = message_queue
@local_object = local_object
@timeout = timeout
if args.first.is_a? String
@local_objects = Hash[*args.shift(2)].freeze
else
@local_objects = args.shift.map do |k,v|
{ k.to_s => v }
end.reduce({},:merge).freeze
end
@timeout = args.pop
end

def run
Expand All @@ -98,22 +105,29 @@ def run!
end

def flush_queue!
@redis_server.del @message_queue
@redis_server.del *queues
end

private

attr_reader :local_objects

def queues
raise :no_queues if local_objects.empty?
local_objects.keys
end

def run_one
# request setup
message_queue, rpc_raw_request = @redis_server.blpop @message_queue, timeout
queue, rpc_raw_request = @redis_server.blpop *(queues.shuffle << timeout)
return nil if rpc_raw_request.nil?
rpc_request = MultiJson.load rpc_raw_request
response_queue = rpc_request['response_queue']
function_call = rpc_request['function_call']

# request execution
begin
return_value = @local_object.send( function_call['name'].to_sym, *function_call['args'] )
return_value = local_objects[queue].send( function_call['name'].to_sym, *function_call['args'] )
rpc_response = {'return_value' => return_value}
rescue Object => err
rpc_response = {'exception' => err.to_s, 'backtrace' => err.backtrace}
Expand Down