pigato 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 875fcb4804ac38a1ff53945215a523b1b595d2f7
-  data.tar.gz: 5ede6bd897a90b70f892d92a33c5178df105b36d
+  metadata.gz: d886159958134335adb64744e996ff740094638a
+  data.tar.gz: f3d27bdf54f03ca35d5e242b9e1b4bc0e392fac3
 SHA512:
-  metadata.gz: 31d40715632db839f3cd03771bb26cb40b34f1dfd084d34c6e4981614ad960391c321e8c09f7d6e266414f4e07cb1bc3b406fbb97aa0faa6dcb3082108f29918
-  data.tar.gz: 42b29b0c476ce11597717c6170829bf6b8aaf64a634ee18246e481a540839cb1c17aee130d5ec0de640fb50304ab34d3990b3fd0ef566161da78f564c4a504f8
+  metadata.gz: a27f759e40e610785e3fdae874f03fd0a35dab717c7e017be308b6fef2e4abfeca7eef32c6c40277b3f403b5e2bc43615b406c8dbaacbba961ad61cb40a9bf1a
+  data.tar.gz: 7afce2bd05f57ddf66fb842f08f55e0fa9b7e95751671586aa5835ddf4d63a97b25fd82ab91ee437163622c0b0a033eccde41e6520c90be3b67939b062a83d44

data/examples/echo_client.rb

@@ -4,7 +4,7 @@ require "rubygems"
 require "#{File.dirname(__FILE__)}/../lib/pigato.rb"
 #require "pigato"
 
-client = PigatoClient.new('tcp://localhost:55555')
+client = Pigato::Client.new('tcp://localhost:55555')
 requests = 1000
 d1 = Time.now
 requests.times do |i|

data/examples/echo_worker.rb

@@ -4,7 +4,7 @@ require "rubygems"
 require "#{File.dirname(__FILE__)}/../lib/pigato.rb"
 #require "pigato"
 
-worker = PigatoWorker.new('tcp://localhost:55555', 'echo')
+worker = Pigato::Worker.new('tcp://localhost:55555', 'echo')
 reply = nil
 
 loop do

data/lib/pigato/client.rb

@@ -1,16 +1,16 @@
 require "oj"
 require "securerandom"
 
-class PigatoClient
+class Pigato::Client
 
   def initialize broker
     @broker = broker
     @context = ZMQ::Context.new(1)
-    @client = nil
+    @socket = nil
     @poller = ZMQ::Poller.new
     @timeout = 2500
 
-    reconnect_to_broker
+    start
   end
 
   def send service, request, timeout = @timeout
@@ -18,7 +18,7 @@ class PigatoClient
 
     rid = SecureRandom.uuid
     request = [Pigato::C_CLIENT, Pigato::W_REQUEST, service, rid].concat(request)
-    @client.send_strings request
+    @socket.send_strings request
 
     res = [] 
     while 1 do
@@ -38,7 +38,7 @@ class PigatoClient
       msg = []
       d1 = Time.now
       while 1 do
-        @client.recv_strings(msg, ZMQ::DONTWAIT)
+        @socket.recv_strings(msg, ZMQ::DONTWAIT)
         msg = [] if msg.length < 5 || msg[3] != rid
         break if msg.length > 0 || ((Time.now - d1) * 1000 > timeout)
         sleep(1.0 / 50.0)
@@ -55,16 +55,24 @@ class PigatoClient
     end
     nil
   end
+  
+  def start
+    reconnect_to_broker
+  end
+
+  def stop
+    $socket.close
+  end
 
   def reconnect_to_broker
-    if @client
-      @poller.deregister @client, ZMQ::DEALER
+    if @socket
+      @poller.deregister @socket, ZMQ::DEALER
     end
 
-    @client = @context.socket ZMQ::DEALER
-    @client.setsockopt ZMQ::LINGER, 0
-    @client.setsockopt ZMQ::IDENTITY, SecureRandom.uuid
-    @client.connect @broker
-    @poller.register @client, ZMQ::POLLIN
+    @socket = @context.socket ZMQ::DEALER
+    @socket.setsockopt ZMQ::LINGER, 0
+    @socket.setsockopt ZMQ::IDENTITY, SecureRandom.uuid
+    @socket.connect @broker
+    @poller.register @socket, ZMQ::POLLIN
   end
 end

data/lib/pigato/version.rb

@@ -1,3 +1,3 @@
 module Pigato
-  VERSION = "0.1.8"
+  VERSION = "0.1.9"
 end

data/lib/pigato/worker.rb

@@ -2,7 +2,7 @@ require "oj"
 require "ffi-rzmq"
 require "securerandom"
 
-class PigatoWorker
+class Pigato::Worker
 
   HEARTBEAT_LIVENESS = 3 # 3-5 is reasonable
 
@@ -11,7 +11,7 @@ class PigatoWorker
     @service = service
     @context = ZMQ::Context.new(1)
     @poller = ZMQ::Poller.new
-    @worker = nil # Socket to broker
+    @socket = nil # Socket to broker
     @heartbeat_at = 0 # When to send HEARTBEAT (relative to time.time(), so in seconds)
     @liveness = 0 # How many attempts left
     @timeout = 2500
@@ -39,7 +39,7 @@ class PigatoWorker
       items = @poller.poll(@timeout) 
       if items
         msg = []
-        @worker.recv_strings msg
+        @socket.recv_strings msg
 
         @liveness = HEARTBEAT_LIVENESS
 
@@ -84,16 +84,16 @@ class PigatoWorker
   end
 
   def reconnect_to_broker
-    if @worker
-      @poller.deregister @worker, ZMQ::DEALER
-      @worker.close
+    if @socket
+      @poller.deregister @socket, ZMQ::DEALER
+      @socket.close
     end
 
-    @worker = @context.socket ZMQ::DEALER
-    @worker.setsockopt ZMQ::IDENTITY, SecureRandom.uuid
-    @worker.setsockopt ZMQ::LINGER, 0 
-    @worker.connect @broker
-    @poller.register @worker, ZMQ::POLLIN
+    @socket = @context.socket ZMQ::DEALER
+    @socket.setsockopt ZMQ::IDENTITY, SecureRandom.uuid
+    @socket.setsockopt ZMQ::LINGER, 0 
+    @socket.connect @broker
+    @poller.register @socket, ZMQ::POLLIN
     send_to_broker(Pigato::W_READY, @service, [])
     @liveness = HEARTBEAT_LIVENESS
     @heartbeat_at = Time.now + 0.001 * @heartbeat
@@ -109,6 +109,6 @@ class PigatoWorker
     message = [Pigato::W_WORKER, command].concat message
     message = message.concat(options) if options
     
-    @worker.send_strings message
+    @socket.send_strings message
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pigato
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Paolo Ardoino