basicjrpc 0.1.37 → 0.1.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72cd2ade2cee4330644c8b99ec8b174abab77af7
-  data.tar.gz: d62b247910c40fc9770c20789e6a5d55aeda1047
+  metadata.gz: 3a2ddcbc80ba7e3010ee992cae5370bf21c4ab06
+  data.tar.gz: c5a2db033e7509fdd1743fe107627368d5c40129
 SHA512:
-  metadata.gz: 629a3c959e19b9f45c05a77da513ea5360106a555b67132185f286e8da0b5f37e93478804aa31ac94ea4b69f1a80fee8b7ecb53ffa46b82ae1e3315ecaae458c
-  data.tar.gz: eaa61291b718c0499033d4dd0e134245bcd46e27bfb9e80f1764077418d3e84bd8ad7273826a3f0b37b4c70bc3d75bc4bbef0a834757571488e20b158436602c
+  metadata.gz: 710b6d4d405e5285fc824933e2f55744a1d5813668679d3a0dbf6b0ee3562e94ee0967b08a1d1e5d2f3d6c792d84efc57829780d7354aafa42b0a11cc9b812cd
+  data.tar.gz: 7e450d97027206cac35f1b446b7c555d9cf4b05be53c782e2f978d0f5e29f9b6d30ed9f2ce35268818c4ca78706d0430da1fa40e620f95b26f6ea6c896f48be6

data/basicjrpc.gemspec

@@ -21,7 +21,6 @@ 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'

data/lib/basicjrpc/client.rb

@@ -15,7 +15,8 @@ module BasicJRPC
       @payload = {}
       @timeout = timeout
       @instance_id = SecureRandom.uuid
-      @nsq_producer = Nsq::Producer.new(nsqd: 'dockerlb:4150', topic: @queue)
+      #@nsq_producer = Nsq::Producer.new(nsqd: 'dockerlb:4150', topic: @queue)
+      @redis = Redis.new(host: "redis")
     end
     
     def method_missing(m, *args, &block)
@@ -30,19 +31,20 @@ module BasicJRPC
       my_message = false
       
       puts "Writing Message #{payload[:message_id]} #{payload[:method_name]}"
-      @nsq_producer.write(Oj.dump(payload))
+      #@nsq_producer.write(Oj.dump(payload))
+      @redis.rpush(@queue, Oj.dump(payload))
       
       Timeout::timeout(5) {
         Oj.load(Redis.new(host: "redis").blpop(payload[:message_id])[1])
       }
     rescue Exception => e
-      terminate
+      #terminate
       raise e
     end
     
     # This must be called
     def terminate
-      @nsq_producer.terminate
+      #@nsq_producer.terminate
     end
   end
 
@@ -52,9 +54,10 @@ module BasicJRPC
       payload[:message_id] = SecureRandom.uuid
       payload[:response] = true
       payload[:caller] = caller.first(10)
-      @nsq_producer.write(Oj.dump(payload))
+      #@nsq_producer.write(Oj.dump(payload))
+      @redis.rpush(@queue, Oj.dump(payload))
     rescue Exception => e
-      terminate
+      #terminate
       raise e
     end
   end

data/lib/basicjrpc/server.rb

@@ -4,30 +4,36 @@ module BasicJRPC
     def initialize queue, injected_class
       @injected_class = injected_class
       @queue = queue
-      @nsq_consumer = Nsq::Consumer.new(nsqlookupd: 'dockerlb:4161', topic: @queue, channel: 'server')
+      #@nsq_consumer = Nsq::Consumer.new(nsqlookupd: 'dockerlb:4161', topic: @queue, channel: 'server')
+      @redis = Redis.new(host: "redis")
     end
     
     def listen
       puts "Listening..."
       while true
-        message = @nsq_consumer.pop
+        redis_response = @redis.brpop(@queue, { :timeout => 10 })
+        next if redis_response.nil?
+        message = redis_response[1]
+        
+        #message = @nsq_consumer.pop
+        
         payload = Oj.load(message.body)
         puts "Processing message #{payload.message_id} #{payload.method_name} #{payload.method_arguments} #{payload.callers}"
         
         # Should always return a data object
         response = @injected_class.send(payload.method_name, *payload.method_arguments)
 
-        Redis.new(host: "redis").rpush(payload.message_id, Oj.dump(response))
-        message.finish
+        @redis.rpush(payload.message_id, Oj.dump(response))
+        #message.finish
       end
     rescue Exception => e
-      message.finish
-      terminate
+      #message.finish
+      #terminate
       raise e
     end
     
     def terminate
-      @nsq_consumer.terminate
+      #@nsq_consumer.terminate
     end
     
   end

data/lib/basicjrpc/version.rb

@@ -1,3 +1,3 @@
 module BasicJRPC
-  VERSION = "0.1.37"
-end
+  VERSION = "0.1.38"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: basicjrpc
 version: !ruby/object:Gem::Version
-  version: 0.1.37
+  version: 0.1.38
 platform: ruby
 authors:
 - Martin Simpson
@@ -38,20 +38,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: nsq-ruby
-  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: redis
   requirement: !ruby/object:Gem::Requirement