pigato 0.2.14 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d98e3d33779bd55e21b6dd1ad0311e059ea142bf
-  data.tar.gz: f520a52c6ae420c5d59dbd60ff0761174bf56d5f
+  metadata.gz: 010949dd3e9e2e663d03439b6eab02b7604d7b4b
+  data.tar.gz: fbe96707db388daab3f3575ed2b9bad36231f87e
 SHA512:
-  metadata.gz: 31a112e4750fffd77b813e4787f01d0b4c4cc2ac8495cab8d9b944aa31323c7fc44daf2493178ded13d7348117a0c5b06cb519474d4f99fb7d506c244a483256
-  data.tar.gz: 90b78f68f1335be0a1356254f9b5c4abf29735923989ed4b71587b444290ee47e317a0a4c4cbccc379ae2d283c7dbd9ba9470c00a007fa7af997f2bb096557d2
+  metadata.gz: a84a02d209ad7c546645e17740ad26b8cb021b81d2c685bc18717d9a8da264b3ed1d63f72839cdcc4f019612bbfdfb128cb4d532645342d9e5d451c79cbda1a2
+  data.tar.gz: 1726a089c1848997a9d6578eb002fd5f4f150402767e8e6d96cf3f544de0f12c50fd1ee087c94732eef74465f333a2b0f8e14860a6a7cc3f4f5d15894a319085

data/lib/pigato/client.rb

@@ -5,6 +5,7 @@ class Pigato::Client
   def initialize broker, conf = {}
     @broker = broker
     @ctxs = {}
+    @sockets = {}
 
     @conf = {
       :autostart => false,
@@ -18,15 +19,20 @@ class Pigato::Client
     end
   end
 
-  def getid
-    tid = "#" + Process.pid.to_s + "|" + Thread.current.object_id.to_s
+  def get_proc_id
+    pid = "#" + Process.pid.to_s
+    pid
+  end
+ 
+  def get_thread_id
+    tid = get_proc_id() + "|" + Thread.current.object_id.to_s
     tid
   end
  
   def request service, request, opts = {}
-    return nil if @ctxs[getid()] == nil 
+    return nil if @sockets[get_thread_id()] == nil 
     
-    socket = @ctxs[getid()]['socket']
+    socket = @sockets[get_thread_id()]
     
     request = [Oj.dump(request), Oj.dump(opts)]
 
@@ -50,7 +56,7 @@ class Pigato::Client
   end
 
   def _recv rid 
-    socket = @ctxs[getid()]['socket']
+    socket = @sockets[get_thread_id()]
     socket.rcvtimeo = @conf[:timeout]
     data = []
     d1 = Time.now
@@ -72,21 +78,21 @@ class Pigato::Client
   end
 
   def stop
-    tid = getid()
-    if @ctxs[tid]
-      @ctxs[tid]['socket'].close
-      @ctxs[tid]['ctx'].destroy
-      @ctxs.delete(tid)
+    tid = get_thread_id()
+    if @sockets[tid]
+      @sockets[tid].close
     end
   end
 
   def reconnect_to_broker
     stop
-    ctx = ZMQ::Context.new
+    ctx = @ctxs[get_proc_id()]
+    ctx = ZMQ::Context.new if ctx == nil
     ctx.linger = 0
     socket = ctx.socket ZMQ::DEALER
     socket.identity = SecureRandom.uuid
     socket.connect @broker
-    @ctxs[getid()] = { 'socket' => socket, 'ctx' => ctx }
+    @sockets[get_thread_id()] = socket
+    @ctxs[get_proc_id()] = ctx
   end
 end

data/lib/pigato/version.rb

@@ -1,3 +1,3 @@
 module Pigato
-  VERSION = "0.2.14"
+  VERSION = "0.2.15"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pigato
 version: !ruby/object:Gem::Version
-  version: 0.2.14
+  version: 0.2.15
 platform: ruby
 authors:
 - Paolo Ardoino
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-03-31 00:00:00.000000000 Z
+date: 2015-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler