pigato 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcd910a31e9734d1dbeba19bd7b87dca615ed89f
-  data.tar.gz: 4f014edc60b82b36cb2687630413bdb8cfb0391e
+  metadata.gz: 465b8b4e13bd04eac19e0735fd6d218c99eaa4d9
+  data.tar.gz: 8f832511a07fe421e03aa2e2d5a5b77576807680
 SHA512:
-  metadata.gz: 2a817fb5c725e82543b7e6fea605c5417e82189cf003e1a745e222e010522672f270fb5d046f4f2a34c16a5d6a1a6a8959a0dddbe97afce2a25805803891d0b1
-  data.tar.gz: 2d63bc85e8702c03214726d61207e4bffcaf5b2e003a641396cd1cfa3880fa97e582b244d26db0fa9672e10fbf54fdf1f576f687e4f314d4c21add7fc75b83a8
+  metadata.gz: 8fffd135c10bd7e2c2f6b596b7832312dcdc6a36cef4a0b43f49785cae9d1e609047e0f9474ce8e44cf0491cbf715050caec481107cd0e25219372dd254e67ff
+  data.tar.gz: 3f9e800b944bbdbe71fc700a5d2be36e012b69fdd1d7beb84e13c4d59778241e95b0090460ffdcd5f9ebffd130ce303a229ecadffae3b8dadbd196f83646dc38

data/examples/echo_client.rb

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

data/lib/pigato/client.rb

@@ -42,10 +42,12 @@ class Pigato::Client < Pigato::Base
     res = send msg
     return nil if res.nil?
 
+    rtimer = Time.now + (@conf[:timeout] * 0.001)
+
     res = [] 
-    while 1 do
+    while Time.now <= rtimer do
       chunk = _recv rid
-      break if chunk == nil
+      next if chunk == nil
       res << Oj.load(chunk[4])
       break if chunk[0] == Pigato::W_REPLY
     end
@@ -58,7 +60,7 @@ class Pigato::Client < Pigato::Base
   def _recv rid 
     iid = get_iid
     socket = @@sockets[iid]
-    socket.rcvtimeo = @conf[:timeout]
+    socket.rcvtimeo = 2500
     
     data = []
     
@@ -70,8 +72,8 @@ class Pigato::Client < Pigato::Base
 
     if data[3] != rid  
       data = []
-      if conf[:logger]
-        conf[:logger].error("PigatoClient: RID mismatch")
+      if @conf[:logger]
+        @conf[:logger].error("PigatoClient: RID mismatch #{data[3]}/#{rid}")
       end
     end
 

data/lib/pigato/version.rb

@@ -1,3 +1,3 @@
 module Pigato
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

metadata

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