basicjrpc 0.1.25 → 0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc4deab7054ee8cf68379a75cebfd8664f15df55
-  data.tar.gz: c034a0268fceec519f0628c0e0bd79b96fd7661a
+  metadata.gz: 5b38c1ce4deae05d276f3e1e8c619c6136bd010d
+  data.tar.gz: a791ccf4dc75856d9e23993e16d704c24309ba98
 SHA512:
-  metadata.gz: 2c77285fc786203f8ebd7ae7fb43f2c98fae6629776cc7cb172c8d3194cdfdfe22454e51412ffb15af524ae494606c744ed43a6580b745535fd9606c9c8c6407
-  data.tar.gz: 4c8d48af144440d444a49eebcb0e79dc3a2206dfadb381fc2765ace56947a62fb59e355a97c39e00a376fba9c9b95dff6bb3dca3a1ceef6977e453b794bef71f
+  metadata.gz: d09aa5a8d7d70605673cd23f9a9c20e5097b0eccaf75785d922e1cfbdcbca018b458c636975a1959af68a81a9a7b8d72b985035311a028e6bd7752a51069a25c
+  data.tar.gz: 5df95f5a7bcdd674490caafa4de376a84a229ea769d344ef851bea19b5dce4a5e80d5e00d166db6d3a1754c1d3cde5dec6e36a7efcf8c440bf632c9452bcc4e0

data/basicjrpc.gemspec

@@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.11"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_runtime_dependency 'nsq-ruby'
+  spec.add_runtime_dependency 'redis'
   spec.add_runtime_dependency 'oj'  
   spec.add_runtime_dependency 'require_all'
 end

data/lib/basicjrpc/client.rb

@@ -7,6 +7,8 @@ module BasicJRPC
       @queue = queue
       @payload = {}
       @timeout = timeout
+      @instance_id = SecureRandom.uuid
+      @consumer = Nsq::Consumer.new(nsqlookupd: 'dockerlb:4161',topic: "#{@queue}-response", channel: @instance_id)
     end
     
     def method_missing(m, *args, &block)
@@ -15,11 +17,23 @@ module BasicJRPC
     
     def send_request payload
       payload[:message_id] = SecureRandom.uuid
+      payload[:instance_id] = @instance_id
       payload[:response] = true
+            
+      my_message = false
       
       @nsq_producer.write(Oj.dump(payload))
-
-      return Oj.load(Nsq::Consumer.new(nsqlookupd: 'dockerlb:4161',topic: payload[:message_id], channel: 'client').pop.body)
+      
+      # while !my_message
+      #   message = @consumer.pop
+      #   decoded_message = Oj.load(message.body)
+      #   my_message = decoded_message.response if decoded_message.message_id == payload.message_id
+      # end
+      
+      # message.finish
+      # return my_message
+      
+      Oj.load(Redis.new(host: "redis").blpop(payload[:message_id])[1])
     end
   end
 

data/lib/basicjrpc/server.rb

@@ -10,14 +10,18 @@ module BasicJRPC
     def listen
       puts "Listening..."
       while true
-        payload = Oj.load(@nsq_consumer.pop.body)
+        message = @nsq_consumer.pop
+        payload = Oj.load(message.body)
         puts "Processing message #{payload.method_name} #{payload.method_arguments}"
         
         # Should always return a data object
         response = @injected_class.send(payload.method_name, *payload.method_arguments)
 
         # Bounce the response back if response is requested
-        Nsq::Producer.new(nsqd: 'dockerlb:4150', topic: payload.message_id).write(Oj.dump(response)) if payload.response
+        #response_payload = { message_id: payload.message_id, instance_id: payload.instance_id, response: response}
+        #Nsq::Producer.new(nsqd: 'dockerlb:4150', topic: "#{@queue}-response").write(Oj.dump(response_payload)) if payload.response
+        Redis.new(host: "redis").rpush(payload.message_id, Oj.dump(response))
+        message.finish
       end
     end
     

data/lib/basicjrpc/version.rb

@@ -1,3 +1,3 @@
 module BasicJRPC
-  VERSION = "0.1.25"
+  VERSION = "0.1.26"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: basicjrpc
 version: !ruby/object:Gem::Version
-  version: 0.1.25
+  version: 0.1.26
 platform: ruby
 authors:
 - Martin Simpson
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement