redis_rpc 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9446d050ad21ca78739f4d986fd7703a683df9b9
-  data.tar.gz: 2f43f268796cd00c1b77e2fe107ef16fba2ee567
+SHA256:
+  metadata.gz: a5a0c8bebe40efe81928d485dbe2f747c5707be39d44bd093a68c23bd7530028
+  data.tar.gz: 5bff08a69ee054753c03df250756dd663bfe8bc268bf4b72bfbcc546b382f35b
 SHA512:
-  metadata.gz: d81714bc20bb38db199483e30702b99155916b71ab9bec05262beb20cdb2f5d22812edae1af9308424c254de8ab8a0c3b1f0facad459217145809747b7269bf7
-  data.tar.gz: 274515576b96b3173eccec4d8e04888ed797a732f0e250a6bddbbee474b36d047f9fd852f41e5b7bd0d0a255a94ff4b1e55972073f3d020f8c0f96bf9e9cea56
+  metadata.gz: 4aeacfe6adf23f5e3fcbff5396ceed744fe4c312c4b949537cb1b81cb4a19325691a643880b187980e0c81b8062c5313aac9fa8ba1273f026c490b703820f969
+  data.tar.gz: 6600c450251f5f1f2bb8fe89dcb96f15977cba58ab3a41878e19a1f54518b88d8fca14243fad9b2b789c3a0781288305993af7463940f7607e0e3fb78698f304

data/lib/redis_rpc/client.rb

@@ -14,6 +14,7 @@ module RedisRpc
       @redis = Redis.new(url: url)
       @sub_channel = sub_channel
       @pub_channel = pub_channel
+      @level = level
       @timeout = timeout
       @parser = Parser.new(secret_key)
       @res = Response.new(Redis.new(url: url), pub_channel, init_log(level), @parser)
@@ -30,11 +31,11 @@ module RedisRpc
             end
 
             on.message do |channel, args|
-              @logger.info("##{channel}: #{args}")
+              @logger.info("##{channel}: #{args}") if @level <= Logger::INFO
               begin
                 _args = @parser.parse(args)
                 @logger.error(ArgumentError.new("miss method uuid")) and return if _args[:uuid].nil?
-                @res.sync_callback(_args, @timeout) if !@callback.exec_callback(_args)
+                @res.sync_callback(_args) if !@callback.exec_callback(_args)
               rescue Exception => e
                 @logger.error(e)
               end

data/lib/redis_rpc/logic.rb

@@ -1,23 +1,22 @@
 require "redis_rpc/response.rb"
 module RedisRpc
 
-    class Logic
+  class Logic
 
-      attr_accessor :res
+    attr_accessor :res
 
-      def initialize(url, callback, channel, logger, parser)
-        @redis = Redis.new(url: url)
-        @logger = logger
-        @res = Response.new(@redis, channel, logger, parser)
-        @callback = callback
-        @parser = parser
-      end
+    def initialize(url, callback, channel, logger, parser)
+      @logger = logger
+      @res = ClientResponse.new(Redis.new(url: url), channel, logger, parser)
+      @callback = callback
+      @parser = parser
+    end
 
-      def exec(args, timeout)
+    def exec(args, timeout)
+      Thread.new do
         begin
           _args = @parser.parse(args)
-          logger.error(ArgumentError.new("miss method name or uuid")) and return if _args[:uuid].nil? || _args[:method].nil?
-
+          @logger.error(ArgumentError.new("miss method name or uuid")) and return if _args[:uuid].nil? || _args[:method].nil?
           result = @callback.send(_args[:method], *_args[:params])
           @res.publish({uuid: _args[:uuid], _method: _args[:method], result: result}, timeout)
         rescue Exception => e
@@ -27,9 +26,19 @@ module RedisRpc
             @logger.error(e)
           end
         end
-      rescue Exception => e
-        @logger.error(e)
       end
+    rescue Exception => e
+      @logger.error(e)
+    end
+
+  end
+
+  class ClientResponse < Response
+
+    def publish(request, timeout)
+      request_str = @parser.pack(request.to_json)
+      @redis.publish(@channel, request_str)
+    end
 
   end
 

data/lib/redis_rpc/response.rb

@@ -11,18 +11,22 @@ module RedisRpc
       @channel = channel
       @logger = logger
       @parser = parser
+      @sync_handlers = {}
     end
 
     def publish(request, timeout)
       request_str = @parser.pack(request.to_json)
       @redis.publish(@channel, request_str)
-      SyncHandler.new(@redis, request[:uuid], request[:method], @parser.secret_key, timeout)
+      @sync_handlers[request[:uuid]] = SyncHandler.new(@parser.secret_key, request[:method], timeout)
+      Thread.new(@sync_handlers, request[:uuid], timeout) {|handlers, uuid, t| sleep(t+3);  handlers.delete(uuid) }
+      @sync_handlers[request[:uuid]]
     end
 
-    def sync_callback(args, timeout=5)
-        # {uuid: uuid, _method: method, result: result, error: error}
-        @redis.set(args[:uuid], @parser.pack(args.to_json))
-        @redis.expire(args[:uuid], timeout.to_i)
+    def sync_callback(args)
+      # {uuid: uuid, _method: method, result: result, error: error}
+      unless (sync_handler = @sync_handlers.delete(args[:uuid])).nil?
+        sync_handler.release(args)
+      end
     end
 
     def catch(uuid, e)
@@ -35,31 +39,28 @@ module RedisRpc
 
   class SyncHandler
 
-    SLEEP_TIME = 0.01
-
-    def initialize(redis, uuid, _method, secret_key, timeout=30)
-      @redis = redis
-      @uuid = uuid
-      @_method = _method
-      @expires_at = Time.now + timeout
+    def initialize(secret_key, _method, timeout=10)
       @parser = Parser.new(secret_key)
+      @_method = _method
+      @timeout = timeout
+      @lock = Mutex.new
+      @condition = ConditionVariable.new
     end
 
     def sync
-      while Time.now <= @expires_at
-        result = @redis.get(@uuid)
-        if !result.nil?
-          @redis.del(@uuid)
-          _args = @parser.parse(result)
-          if !_args[:result].nil?
-            return _args[:result]
-          elsif !_args[:error].nil?
-            raise(FunctionCallbackError.new(_args[:error]))
-          end
-        end
-        sleep SLEEP_TIME
+      @lock.synchronize { @condition.wait(@lock, @timeout) }
+      if @response.nil?
+        raise(Timeout::Error.new("method: #{@_method} wait for timeout #{@timeout}s"))
+      elsif !@response[:result].nil?
+        return @response[:result]
+      elsif !@response[:error].nil?
+        raise(FunctionCallbackError.new(@response[:error]))
       end
-      raise(Timeout::Error.new("method: #{@_method} wait for timeout"))
+    end
+
+    def release(res)
+      @response = res
+      @lock.synchronize { @condition.signal }
     end
 
   end

data/lib/redis_rpc/server.rb

@@ -13,6 +13,7 @@ module RedisRpc
       @redis = Redis.new(url: url)
       @sub_channel = sub_channel
       @pub_channel = pub_channel
+      @level = level
       @timeout = timeout
       @parser = Parser.new(secret_key)
       @logic = Logic.new(url, front_object, pub_channel, init_log(level), @parser)
@@ -33,7 +34,7 @@ module RedisRpc
           end
 
           on.message do |channel, args|
-            @logger.info("##{channel}: #{args}")
+            @logger.info("##{channel}: #{args}") if @level <= Logger::INFO
             @logic.exec(args, @timeout)
           end
           on.unsubscribe do |channel, subscriptions|

data/lib/redis_rpc/version.rb

@@ -1,3 +1,3 @@
 module RedisRpc
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: redis_rpc
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - benko
@@ -44,7 +44,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: redis rpc