pigato 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdf1137eca61937e2e82029877d8019e644e666d
-  data.tar.gz: fa72b975774ccbbb195da86b0fceae53a302a473
+  metadata.gz: 21be3b79c7dd6549e1d73d37fe5c02ab26f30fc0
+  data.tar.gz: e2d78c8222b6ddd1b3a97f5894eeede4337d4719
 SHA512:
-  metadata.gz: bd2a025e0dcc5242622fac54e0e8e60ec32fdf7efbac0388feb68ece36cd93e9c778f07cb4b927a050f949028c973bd42a97f3454abf27c62ea701a818d4da2b
-  data.tar.gz: 38cef7013fabeaea9c6dd52af0e875e9928d8891d3d74d1a03b8c64b6f3f7f664b699dc803bda91ce5e33d8ff7b2055d8948564429348025f83de1de721f36b2
+  metadata.gz: 0baa6b8705e6d3262af29a3d8d1434ea6823d0f85f4ec63fa40c8a1890093e23fbe9a7445642f9a99f344542c8c34208f18b1c5d43701e58b1ef9088e1ab6373
+  data.tar.gz: f67180228c8414f228559a6fc30945b77d49d069f000482fa130fa774e9470bc1b94c8f1400c49c093fac9f928f43a62180528852794886172d140c0b03a2727

data/examples/echo_client.rb

@@ -8,19 +8,25 @@ require 'thread'
 def start
   ts = []
 
-  (0..5).each do |tid|
+  (0..10).each do |tid|
     ts << Thread.new {
-      client = Pigato::Client.new('tcp://127.0.0.1:55555', { :autostart => true })
+      client = Pigato::Client.new('tcp://127.0.0.1:55555', { :autostart => true, :timeout => 20000 })
 
       requests = 1000
+      success = 0
       d1 = Time.now
       requests.times do |i|
         begin
-          client.request('echo', 'Hello world1')
+          res = client.request('echo', 'Hello world1')
+          if res
+            success += 1
+          else
+            puts "nil reply"
+          end
         end
       end
       d2 = Time.now
-      puts "#{requests} requests/replies processed (#{(d2 - d1) * 1000} milliseconds)"
+      puts "#{success}/#{requests} requests/replies processed (#{(d2 - d1) * 1000} milliseconds)"
     }
   end
 
@@ -29,7 +35,7 @@ def start
   end
 end
 
-(0..1).each do |pid|
+(0..4).each do |pid|
   pid = fork do
     start
   end

data/examples/echo_worker.rb

@@ -7,7 +7,7 @@ require "#{File.dirname(__FILE__)}/../lib/pigato.rb"
 def start
   ts = []
 
-  (0..5).each do |tid|
+  (0..10).each do |tid|
     ts << Thread.new {
       worker = Pigato::Worker.new('tcp://127.0.0.1:55555', 'echo')
       worker.start
@@ -16,11 +16,8 @@ def start
         request = worker.recv
         if !request.nil?
           worker.reply request
-        else
-          sleep 0.1
         end
-        sleep 40
-        worker.start
+        #sleep 0.1
       end
     }
   end
@@ -30,7 +27,7 @@ def start
   end
 end
 
-(0..1).each do |pid|
+(0..4).each do |pid|
   fork do
     start
   end

data/lib/pigato/client.rb

@@ -61,13 +61,19 @@ class Pigato::Client < Pigato::Base
     socket.rcvtimeo = @conf[:timeout]
     
     data = []
-    d1 = Time.now
+    
     msg = socket.recv_message()
     while 1 do
-      break if !msg || msg.size == 0
+      break if msg.nil? || msg.size == 0
       data << msg.pop.data
     end
-    data = [] if data[3] != rid
+
+    if data[3] != rid  
+      data = []
+      if conf[:logger]
+        conf[:logger].error("PigatoClient: RID mismatch")
+      end
+    end
 
     return nil if data.length == 0
 

data/lib/pigato/version.rb

@@ -1,3 +1,3 @@
 module Pigato
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

data/lib/pigato/worker.rb

@@ -11,14 +11,13 @@ class Pigato::Worker < Pigato::Base
     @conf = {
       :autostart => false,
       :timeout => 2500,
-      :heartbeat => 2500,
       :reconnect => 2500
     }
     
     @conf.merge!(conf)
 
+    @heartbeat_at = Time.now
     @liveness = 0
-    @heartbeat_at = 0
     @reply_to = nil
     @reply_rid = nil
     @reply_service = nil
@@ -41,13 +40,13 @@ class Pigato::Worker < Pigato::Base
               request.reverse.each{|p| msg.push(ZMQ::Frame(p))}
               client.send msg
             end
-            @@global_heartbeat_at = Time.now + 2 
+            @@global_heartbeat_at = Time.now + 1
           end
         rescue => e
           puts e
         end
         @@mtx.unlock
-        sleep 2
+        sleep 1
       end
     end
   end
@@ -105,12 +104,12 @@ class Pigato::Worker < Pigato::Base
         start
       end
     end
-
+      
     if Time.now > @heartbeat_at
-      send Pigato::W_HEARTBEAT
-      @heartbeat_at = Time.now + 0.001 * @conf[:heartbeat]
+      send(Pigato::W_HEARTBEAT, ['', Oj.dump({ 'concurrency' => 1 })])
+      @heartbeat_at = Time.now + 0.001 * @conf[:timeout]
     end
-
+    
     val
   end
 
@@ -120,7 +119,6 @@ class Pigato::Worker < Pigato::Base
     send Pigato::W_READY, @service
     super
     @liveness = HEARTBEAT_LIVENESS
-    @heartbeat_at = Time.now + 0.001 * @conf[:heartbeat]
   end
 
   def stop

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pigato
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Paolo Ardoino
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-06 00:00:00.000000000 Z
+date: 2016-02-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler