basicjrpc 0.1.31 → 0.1.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 203bcf05fa75bb27c94d3d9d14dd978d48645d20
-  data.tar.gz: 7b3411a5576e196e12c15ee4f01a35a3ccd96ef5
+  metadata.gz: 2418cb1148189c391005749334e2fe9e7b87036b
+  data.tar.gz: 3619e7f940db3e2f5cf851e73ae27847fa7697fc
 SHA512:
-  metadata.gz: 6b3acaa696fb6e415c2ba1c7bc5e772110e0f4c60194ca4a207893b5e46f43d560a329cf5d568ec82789f59928fb179447ad8b7147f085e725e0eccf217265e8
-  data.tar.gz: fff9e4aff8c96ec007b4bba10630263083d693647d5eab5043e7ea2df2a320d9539c188dee485da6404427804b280cdb27ec707117a95105b3ab34958bd7c1d1
+  metadata.gz: 3436a59c73df61b4e09d34fa843947dda305d12b7c6bcb9993a9a48e60a255d8ea00ad1016be1fc15fd08153391cd124d4f21bb6d54d88673cb62d53192f137c
+  data.tar.gz: a588da73a917506f97cb5c06ea937578796ad1c1b38ef9d28bf177a12a049949b161da0b3e636d0ac839d303f7fdb04f211511a57ce75e20d5cd3a6ff5b84060

data/lib/basicjrpc/client.rb

@@ -1,5 +1,11 @@
 require 'timeout'
 
+
+##### WARNING
+##### WARNING
+##### THERE IS NO DEAD-CLIENT PROTECTION
+##### THIS WILL DAMAGE UPSTREAM REQUESTS UNTIL RELOADED
+
 module BasicJRPC
   
   # Responding Client
@@ -13,27 +19,30 @@ module BasicJRPC
     end
     
     def method_missing(m, *args, &block)
-      send_request({ :method_name => m, :method_arguments => args })
+      send_request({ :method_name => m, :method_arguments => args, :callers => caller.first(10) })
     end
     
     def send_request payload
-      
       payload[:message_id] = SecureRandom.uuid
       payload[:instance_id] = @instance_id
       payload[:response] = true
             
       my_message = false
       
+      puts "Writing Message #{payload[:message_id]} #{payload[:method_name]}"
       @nsq_producer.write(Oj.dump(payload))
       
       Timeout::timeout(5) {
         Oj.load(Redis.new(host: "redis").blpop(payload[:message_id])[1])
       }
+    rescue Exception => e
+      terminate
+      raise e
     end
     
     # This must be called
     def terminate
-      nsq_producer.terminate
+      @nsq_producer.terminate
     end
   end
 
@@ -42,7 +51,11 @@ module BasicJRPC
     def send_request payload
       payload[:message_id] = SecureRandom.uuid
       payload[:response] = true
+      payload[:caller] = caller.first(10)
       @nsq_producer.write(Oj.dump(payload))
+    rescue Exception => e
+      terminate
+      raise e
     end
   end
   

data/lib/basicjrpc/server.rb

@@ -12,7 +12,7 @@ module BasicJRPC
       while true
         message = @nsq_consumer.pop
         payload = Oj.load(message.body)
-        puts "Processing message #{payload.method_name} #{payload.method_arguments}"
+        puts "Processing message #{payload.method_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)
@@ -20,6 +20,14 @@ module BasicJRPC
         Redis.new(host: "redis").rpush(payload.message_id, Oj.dump(response))
         message.finish
       end
+    rescue Exception => e
+      message.finish
+      terminate
+      raise e
+    end
+    
+    def terminate
+      @nsq_consumer.terminate
     end
     
   end

data/lib/basicjrpc/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: basicjrpc
 version: !ruby/object:Gem::Version
-  version: 0.1.31
+  version: 0.1.32
 platform: ruby
 authors:
 - Martin Simpson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2016-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler