basicjrpc 0.1.30 → 0.1.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ecf40580eab4df0bba9c02d9b9bb22fdf0aa9f4
-  data.tar.gz: bd75b10862e2348dd52386e2164e874fd340ef1a
+  metadata.gz: 203bcf05fa75bb27c94d3d9d14dd978d48645d20
+  data.tar.gz: 7b3411a5576e196e12c15ee4f01a35a3ccd96ef5
 SHA512:
-  metadata.gz: 8c4b4f358ee15ef6d8dd622f8cb9baa1083f85bc49d98762d9275dd7c747cf1598987ac470a0e4a78dbe5bbacd7c7814a0ffa9cbab5978339020022548a66a82
-  data.tar.gz: 1c60d9d54ff4d5af99303e43eaae5445361fa2da41c1a6e4c114434b6fc8487f9c6af9980c11c1f9b4ef773fad22861e670e90284c4c175230fdfe91c32d57c6
+  metadata.gz: 6b3acaa696fb6e415c2ba1c7bc5e772110e0f4c60194ca4a207893b5e46f43d560a329cf5d568ec82789f59928fb179447ad8b7147f085e725e0eccf217265e8
+  data.tar.gz: fff9e4aff8c96ec007b4bba10630263083d693647d5eab5043e7ea2df2a320d9539c188dee485da6404427804b280cdb27ec707117a95105b3ab34958bd7c1d1

data/lib/basicjrpc/client.rb

@@ -9,6 +9,7 @@ module BasicJRPC
       @payload = {}
       @timeout = timeout
       @instance_id = SecureRandom.uuid
+      @nsq_producer = Nsq::Producer.new(nsqd: 'dockerlb:4150', topic: @queue)
     end
     
     def method_missing(m, *args, &block)
@@ -16,7 +17,6 @@ module BasicJRPC
     end
     
     def send_request payload
-      nsq_producer = Nsq::Producer.new(nsqd: 'dockerlb:4150', topic: @queue)
       
       payload[:message_id] = SecureRandom.uuid
       payload[:instance_id] = @instance_id
@@ -24,12 +24,17 @@ module BasicJRPC
             
       my_message = false
       
-      nsq_producer.write(Oj.dump(payload))
-      nsq_producer.terminate
+      @nsq_producer.write(Oj.dump(payload))
+      
       Timeout::timeout(5) {
         Oj.load(Redis.new(host: "redis").blpop(payload[:message_id])[1])
       }
     end
+    
+    # This must be called
+    def terminate
+      nsq_producer.terminate
+    end
   end
 
   # Fire And Forget Client
@@ -37,9 +42,7 @@ module BasicJRPC
     def send_request payload
       payload[:message_id] = SecureRandom.uuid
       payload[:response] = true
-      nsq_producer = Nsq::Producer.new(nsqd: 'dockerlb:4150', topic: @queue)
-      nsq_producer.write(Oj.dump(payload))
-      nsq_producer.terminate
+      @nsq_producer.write(Oj.dump(payload))
     end
   end
   

data/lib/basicjrpc/server.rb

@@ -17,9 +17,6 @@ module BasicJRPC
         # Should always return a data object
         response = @injected_class.send(payload.method_name, *payload.method_arguments)
 
-        # Bounce the response back if response is requested
-        #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

data/lib/basicjrpc/version.rb

@@ -1,3 +1,3 @@
 module BasicJRPC
-  VERSION = "0.1.30"
+  VERSION = "0.1.31"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: basicjrpc
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.1.31
 platform: ruby
 authors:
 - Martin Simpson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-11 00:00:00.000000000 Z
+date: 2016-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -134,7 +134,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Basic JRPC Handler