pigato 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b822493aa1119e5d424b54ea0ba8abf7aa6f5d3e
-  data.tar.gz: 86c7e13b733bde0f9a98fffd81da9d254b48aef3
+  metadata.gz: bdf1137eca61937e2e82029877d8019e644e666d
+  data.tar.gz: fa72b975774ccbbb195da86b0fceae53a302a473
 SHA512:
-  metadata.gz: 427ee48ca61901c6f42634874f79fb76336d0d15ea25186c5dec23eea175643694f56fe41591de5bc88bec74c678af2f6e3218b0e2e276a794c0e6502d4e0b23
-  data.tar.gz: 042ae6003050d3bcf0dbe5d5015bdd46bb56a668bba9bae771966eddb091429540e7b24bdb077e13d2373ab973097be7fda6e6e08868343a411709049868d592
+  metadata.gz: bd2a025e0dcc5242622fac54e0e8e60ec32fdf7efbac0388feb68ece36cd93e9c778f07cb4b927a050f949028c973bd42a97f3454abf27c62ea701a818d4da2b
+  data.tar.gz: 38cef7013fabeaea9c6dd52af0e875e9928d8891d3d74d1a03b8c64b6f3f7f664b699dc803bda91ce5e33d8ff7b2055d8948564429348025f83de1de721f36b2

data/examples/echo_worker.rb

@@ -19,6 +19,8 @@ def start
         else
           sleep 0.1
         end
+        sleep 40
+        worker.start
       end
     }
   end

data/lib/pigato/base.rb

@@ -1,8 +1,10 @@
 class Pigato::Base
 
   @@sockets = {}
+  @@sockets_ids = {}
   @@mtxs = {}
   @@mtx = Mutex.new
+  @@global_heartbeat_at = Time.now
 
   def init 
     @iid = SecureRandom.uuid
@@ -49,14 +51,16 @@ class Pigato::Base
       end
 
       socket = ctx.socket ZMQ::DEALER
-      socket.identity = SecureRandom.uuid
+      sid = SecureRandom.uuid
+      socket.identity = sid 
       socket.connect @broker
 
       if !@conf[:timeout].nil? then
-        socket.rcvtimeo = @conf[:timeout];
+        socket.rcvtimeo = @conf[:timeout]
       end
 
       @@sockets[get_iid] = socket
+      @@sockets_ids[get_iid] = sid 
     }
   end
   
@@ -73,6 +77,7 @@ class Pigato::Base
         rescue
         end
         @@sockets.delete(iid)
+        @@sockets_ids.delete(iid)
       end
     }
   end

data/lib/pigato/client.rb

@@ -1,7 +1,6 @@
 require "#{File.dirname(__FILE__)}/base.rb"
 
 class Pigato::Client < Pigato::Base
-
   @@mtx = Mutex.new
   @@ctxs = {}
   @@sockets = {}
@@ -23,20 +22,25 @@ class Pigato::Client < Pigato::Base
     end
   end
 
-  def request service, request, opts = {}
+  def send msg
     iid = get_iid
     start if @@sockets[iid] == nil && @conf[:autostart]
-    
     socket = get_socket
     return nil if socket.nil?
+    socket.send_message msg
+    true
+  end
 
+  def request service, request, opts = {}
     request = [Oj.dump(request), Oj.dump(opts)]
 
     rid = SecureRandom.uuid
     request = [Pigato::C_CLIENT, Pigato::W_REQUEST, service, rid].concat(request)
     msg = ZMQ::Message.new
     request.reverse.each{|p| msg.push(ZMQ::Frame(p))}
-    socket.send_message msg
+
+    res = send msg
+    return nil if res.nil?
 
     res = [] 
     while 1 do

data/lib/pigato/version.rb

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

data/lib/pigato/worker.rb

@@ -22,80 +22,96 @@ class Pigato::Worker < Pigato::Base
     @reply_to = nil
     @reply_rid = nil
     @reply_service = nil
-    
+  
     init
 
     if @conf[:autostart]
       start
     end
+
+    Thread.new do
+      client = Pigato::Client.new(broker, { :autostart => true })
+      loop do
+        @@mtx.lock
+        begin
+          if Time.now > @@global_heartbeat_at
+            @@sockets_ids.each do |iid, sid|
+              request = [Pigato::C_CLIENT, Pigato::W_HEARTBEAT, "worker", sid]
+              msg = ZMQ::Message.new
+              request.reverse.each{|p| msg.push(ZMQ::Frame(p))}
+              client.send msg
+            end
+            @@global_heartbeat_at = Time.now + 2 
+          end
+        rescue => e
+          puts e
+        end
+        @@mtx.unlock
+        sleep 2
+      end
+    end
   end
   
   def reply reply
     reply = [@reply_to, '', @reply_rid, '0'].concat([Oj.dump(reply)])
     send Pigato::W_REPLY, reply
   end
-
+  
   def recv
+    val = nil
 
-    loop do
-      @reply_rid = nil
-      @reply_to = nil
-      @reply_service = nil
+    @reply_rid = nil
+    @reply_to = nil
+    @reply_service = nil
 
-      iid = get_iid
-      
-      start if @@sockets[iid] == nil && @conf[:autostart]
+    iid = get_iid
 
-      socket = get_socket
-      return nil if socket.nil?
+    start if @@sockets[iid] == nil && @conf[:autostart]
 
-      socket.rcvtimeo = @conf[:timeout]
+    socket = get_socket
+    return nil if socket.nil?
 
-      msg = socket.recv_message
+    socket.rcvtimeo = @conf[:timeout]
 
-      return nil if msg.nil?
+    msg = socket.recv_message
 
-      if msg && msg.size 
-        @liveness = HEARTBEAT_LIVENESS
+    if msg && msg.size
+      @liveness = HEARTBEAT_LIVENESS
 
-        header = msg.pop.data
-        if header != Pigato::W_WORKER
-          puts "E: Header is not Pigato::WORKER"
-          next
-        end
+      header = msg.pop.data
+      if header != Pigato::W_WORKER
+        puts "E: Header is not Pigato::WORKER"
+        return nil
+      end
 
-        command = msg.pop.data
-
-        case command
-        when Pigato::W_REQUEST
-          # We should pop and save as many addresses as there are
-          # up to a null part, but for now, just save one...
-          @reply_to = msg.pop.data
-          @reply_service = msg.pop.data
-          msg.pop # empty
-          @reply_rid = msg.pop.data
-          val = Oj.load(msg.pop.data) # We have a request to process
-          return val 
-        when Pigato::W_HEARTBEAT
-          # do nothing
-        when Pigato::W_DISCONNECT
-          start
-        else
-        end
+      command = msg.pop.data
+
+      case command
+      when Pigato::W_REQUEST
+        @reply_to = msg.pop.data
+        @reply_service = msg.pop.data
+        msg.pop # empty
+        @reply_rid = msg.pop.data
+        val = Oj.load(msg.pop.data) 
+      when Pigato::W_HEARTBEAT
+      when Pigato::W_DISCONNECT
+        start
       else
-        @liveness -= 1
-        if @liveness == 0
-          sleep 0.001 * @conf[:reconnect]
-          start
-        end
       end
-
-      if Time.now > @heartbeat_at
-        send Pigato::W_HEARTBEAT
-        @heartbeat_at = Time.now + 0.001 * @conf[:heartbeat]
+    else
+      @liveness -= 1
+      if @liveness == 0
+        sleep 0.001 * @conf[:reconnect]
+        start
       end
+    end
 
+    if Time.now > @heartbeat_at
+      send Pigato::W_HEARTBEAT
+      @heartbeat_at = Time.now + 0.001 * @conf[:heartbeat]
     end
+
+    val
   end
 
   def start 

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: pigato
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Paolo Ardoino
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-30 00:00:00.000000000 Z
+date: 2016-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rbczmq
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 1.7.9
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.1
 description: PIGATO-RUBY
@@ -73,7 +73,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - CODE_OF_CONDUCT.md
 - Gemfile
 - LICENSE.txt
@@ -101,19 +101,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: PIGATO-RUBY
 test_files: []
-has_rdoc: