basicjrpc 0.1.75 → 0.1.76

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9273eb13746a78138f52da26bd189175af30306c
-  data.tar.gz: 2bdf53c563371e9de35b2ea8f997a6d7f4d62b22
+  metadata.gz: d6b795ccc42f1a96ac34b0346d79d9c8ae0f23da
+  data.tar.gz: 513f4071568d8ae68233cba2c9a4220c0fb91efa
 SHA512:
-  metadata.gz: 93e5e46ce3212a8e9c626f8539aa419b862cf4584444c14326719b6e7267f1d4ed0e5c20b8d7d03fb59e68ea051fac0c7ce72782d6562c78f930481ba07ed0a5
-  data.tar.gz: cda0d32984441393298d7d9b6631c023002cb4e142b76cb0b5fe4a79f1a094381a0fc2e36058d75c525d155ca73f270b3d29ee8947d1746a19bd37c17204709f
+  metadata.gz: bf5abf3de01fb0f7ab55a04c5278d4a6a1697bf9eb17817b482ffa2d7be820d58747d3f99684c4e83c81a311e432efda36d63479d955e4f77b1cf085ad004945
+  data.tar.gz: d903f08dd46e9c797a1535dc535d3ac2e0e74d1d9019c1e44909689eec7fd62e6977b50bd83468dc65bfb184590689bbff3c66712b2602afe7b0366db4732d46

data/basicjrpc.gemspec

@@ -19,9 +19,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.11"
+  spec.add_development_dependency "bundler", "~> 1.17"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_runtime_dependency 'redis'
   spec.add_runtime_dependency 'oj'  
   spec.add_runtime_dependency 'require_all'
-end
+end

data/lib/basicjrpc/client.rb

@@ -1,22 +1,16 @@
-require 'timeout'
-
-
-##### WARNING
-##### WARNING
-##### THERE IS NO DEAD-CLIENT PROTECTION
-##### THIS WILL DAMAGE UPSTREAM REQUESTS UNTIL RELOADED
-
 module BasicJRPC
   
-  # Responding Client
   class Client
     def initialize(queue, timeout=10, host="redis")
       @queue = queue
       @payload = {}
       @timeout = timeout
       @instance_id = SecureRandom.uuid
-      #@nsq_producer = Nsq::Producer.new(nsqd: 'dockerlb:4150', topic: @queue)
-      @redis = Redis.new(host: host, port: 6381)
+      if host.is_a?(Array)
+        @redis = Redis.new(cluster: host.map { |n| "redis://#{n}:6381" }, driver: :hiredis)
+      elsif host.is_a?(String)
+        @redis = Redis.new(host: @host, port: 6381)
+      end
     end
     
     def method_missing(m, *args, &block)
@@ -27,23 +21,12 @@ module BasicJRPC
       payload['message_id'] = SecureRandom.uuid
       payload['instance_id'] = @instance_id
       payload['response'] = true
-            
       my_message = false
       
       @redis.rpush(@queue, Oj.dump(payload))
-      
-      Timeout::timeout(@timeout) {
-        Oj.load(@redis.blpop(payload['message_id'])[1], :symbol_keys => true)
-      }
-    rescue Exception => e
-      #terminate
-      raise e
+      Oj.load(@redis.blpop(payload['message_id'], timeout: @timeout)[1], :symbol_keys => true)
     end
     
-    # This must be called
-    def terminate
-      #@nsq_producer.terminate
-    end
   end
 
   # Fire And Forget Client
@@ -53,9 +36,6 @@ module BasicJRPC
       payload['response'] = true
       payload['caller'] = caller.first(10)
       @redis.rpush(@queue, Oj.dump(payload))
-    rescue Exception => e
-      #terminate
-      raise e
     end
   end
 end

data/lib/basicjrpc/server.rb

@@ -2,20 +2,22 @@ module BasicJRPC
   class Server
         
     def initialize queue, injected_class, host="redis"
+      if host.is_a?(Array)
+        @redis = Redis.new(cluster: host.map { |n| "redis://#{n}:6381" }, driver: :hiredis)
+      elsif host.is_a?(String)
+        @redis = Redis.new(host: @host, port: 6381)
+      end
       @injected_class = injected_class
       @queue = queue
-      #@nsq_consumer = Nsq::Consumer.new(nsqlookupd: 'dockerlb:4161', topic: @queue, channel: 'server')
       @host = host
     end
     
     def listen(trigger=nil, error_handler=nil)
       puts "Listening..."
-      @redis = Redis.new(host: @host, port: 6381)
       
       while true
         begin
           redis_response = @redis.blpop(@queue)
-          #@redis.rpush("#{@queue}-processing", redis_response)
         rescue Redis::TimeoutError
           puts "ERROR: Redis Read timed out. Retrying"
           retry
@@ -45,9 +47,5 @@ module BasicJRPC
       raise e
     end
     
-    def terminate
-      #@nsq_consumer.terminate
-    end
-    
   end
 end

data/lib/basicjrpc/version.rb

@@ -1,3 +1,3 @@
 module BasicJRPC
-  VERSION = "0.1.75"
+  VERSION = "0.1.76"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: basicjrpc
 version: !ruby/object:Gem::Version
-  version: 0.1.75
+  version: 0.1.76
 platform: ruby
 authors:
 - Martin Simpson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-05-14 00:00:00.000000000 Z
+date: 2020-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.17'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -120,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Basic JRPC Handler