basicjrpc 0.1.76 → 0.1.77

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6b795ccc42f1a96ac34b0346d79d9c8ae0f23da
-  data.tar.gz: 513f4071568d8ae68233cba2c9a4220c0fb91efa
+  metadata.gz: 07c6fa5261e851247e736e19b01281547c011138
+  data.tar.gz: bf10703a13c1d38591f8294a3cd965e65c904542
 SHA512:
-  metadata.gz: bf5abf3de01fb0f7ab55a04c5278d4a6a1697bf9eb17817b482ffa2d7be820d58747d3f99684c4e83c81a311e432efda36d63479d955e4f77b1cf085ad004945
-  data.tar.gz: d903f08dd46e9c797a1535dc535d3ac2e0e74d1d9019c1e44909689eec7fd62e6977b50bd83468dc65bfb184590689bbff3c66712b2602afe7b0366db4732d46
+  metadata.gz: 8ba946ffa2fb025e8225884937c5f569006853914e95764f4f8ed8d25a5af423d7acdaf6e8d90c018aebf32574482de420f86bbf25b3a93d4103e9c29b8a5d8d
+  data.tar.gz: 0b3284907dcd17f006b193fb6d2c45bb5c4cf6028eafa9db2cc4dbd4a57c4a3926fa1df968d96947a1da9636f9cdef7c3e1c01838d3595cb8a5af79b4a9fc715

data/lib/basicjrpc/client.rb

@@ -5,7 +5,7 @@ module BasicJRPC
       @queue = queue
       @payload = {}
       @timeout = timeout
-      @instance_id = SecureRandom.uuid
+      @instance_id = SecureRandom.hex(10)
       if host.is_a?(Array)
         @redis = Redis.new(cluster: host.map { |n| "redis://#{n}:6381" }, driver: :hiredis)
       elsif host.is_a?(String)
@@ -18,13 +18,16 @@ module BasicJRPC
     end
     
     def send_request payload
-      payload['message_id'] = SecureRandom.uuid
+      payload['message_id'] = SecureRandom.hex(10)
       payload['instance_id'] = @instance_id
       payload['response'] = true
       my_message = false
       
       @redis.rpush(@queue, Oj.dump(payload))
-      Oj.load(@redis.blpop(payload['message_id'], timeout: @timeout)[1], :symbol_keys => true)
+      
+      response = @redis.blpop(payload['message_id'], @timeout)
+      raise "BasicJRPCResponseTimeout" if response.nil?
+      Oj.load(response[1], :symbol_keys => true)
     end
     
   end
@@ -32,7 +35,7 @@ module BasicJRPC
   # Fire And Forget Client
   class FAFClient < Client
     def send_request payload
-      payload['message_id'] = SecureRandom.uuid
+      payload['message_id'] = SecureRandom.hex(10)
       payload['response'] = true
       payload['caller'] = caller.first(10)
       @redis.rpush(@queue, Oj.dump(payload))

data/lib/basicjrpc/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: basicjrpc
 version: !ruby/object:Gem::Version
-  version: 0.1.76
+  version: 0.1.77
 platform: ruby
 authors:
 - Martin Simpson