marionette 0.0.6 → 0.0.7

data/.gitignore

@@ -3,3 +3,4 @@ pkg/*
 .bundle
 *.output
 *.pid
+*.rb

data/lib/marionette/connect.rb

@@ -38,17 +38,10 @@ module HeadStartApp
       end
       
       # Connect master
-      # require 'ffi-rzmq'
       def master
-        require 'ffi-rzmq'
-
-        # Set ZMQ context
-        context = ZMQ::Context.new(1)
-  
-        # Set socket to talk to puppet
-        socket = context.socket(ZMQ::REQ)
-        socket.connect(@uri.to_s)
-        @connection = HeadStartApp::Marionette::Master.new(socket)
+        
+        # socket is created within Master so Master can attempt reconnect if Puppet reboots
+        @connection = HeadStartApp::Marionette::Master.new(@uri.to_s)
   
       end
       

data/lib/marionette/master.rb

@@ -2,61 +2,122 @@ module HeadStartApp
   module Marionette
 
     require 'uri'
-  
+    require 'ffi-rzmq'
   
     # Master class is the ZMQ socket connection on the puppet master
     class Master
-      attr_accessor :socket, :threads
-  
-      def initialize(socket)
-  
-        # Set socket
-        @socket = socket
+      attr_accessor :socket, :reply
   
+      def initialize(uri)
+        
+        # Set URI and connect to socket
+        @uri = uri
+
       end
-  
+      
       # Sends a msg to puppet node
-      def send(msg)
-  
-        # Send and Receive
-        @socket.send_string Marshal.dump(msg)
+      # and stands by for a reply
+      # and processes reply
+      def talk(msg)
+        
+        # Initial connection to socket 
+        @socket = socket_connect
+
+        # Repeat until talk succeeds.
+        while true do
+
+          # Send the message
+          @socket.send_string Marshal.dump(msg)
+
+          # Poll server until it is receive-able and re-poll if necessary
+          poller = Poller.new @socket, {:max => 10, :interval => 500}
+          break if poller.pull?
+          @socket = socket_reconnect(@socket)
+          
+        end
+        
+        @reply = process_message(@socket.recv_string)
 
       end
       
-      # Stands by for the next msg from puppet
-      # Processes and returns response 
-      def receive
-        
-        # Poll server until it is receive-able
-        poller = ZMQ::Poller.new
-        poller.register_readable @socket
+      private
+      
+        # Re-connect master to puppet socket
+        def socket_reconnect(socket)
+          
+          socket.close
+          socket_connect
+          
+        end
         
-        while true do
+        # Connect master to puppet socket
+        def socket_connect(uri = @uri)
+
+          # Set ZMQ context
+          context = ZMQ::Context.new(1)
+    
+          # Set socket to talk to puppet
+          socket = context.socket(ZMQ::REQ)
+          socket.connect(uri.to_s)
+          
+          socket
           
-          poll_reply = poller.poll 500
-          key = poll_reply.keys.first # fetch the first and only hash key
+        end
+        
+        # Unserialize if necessary
+        def process_message(response)
           
-          break if poll_reply[key][:revents] == 1 # fetch revents
+          begin
+            
+            msg = Marshal.load(response)
+            
+          rescue
+            
+            # Catch non-marshal-able response
+            msg = response
+  
+          end
           
         end
         
-        # Receive message
-        begin
+        class Poller < ZMQ::Poller
+          attr_accessor :pull, :reconnect
           
-          response = socket.recv_string
-          @response = Marshal.load(response)
+          def initialize(socket, options)
+            
+            super()
+            register_readable socket
+            @max = options[:max] if options[:max]
+            @interval = options[:interval] ? options[:interval] : 10
+            @attempt = 0
+            start
+            
+          end
           
-        rescue
+          def pull?
+            @pull
+          end
           
-          # Catch non-marshal-able response
-          @response = response
+          def run!
 
+            @attempt+=1
+            poll_reply = poll @interval
+            key = poll_reply.keys.first # fetch the first and only hash key
+            @pull = poll_reply[key][:revents] == 1 # true if revents==1
+            @attempt <= @max # true if allowed attempt
+            
+          end
+          
+          def start
+            
+            while run! do
+              break if @pull or @reconnect
+            end
+            
+          end
+          
         end
         
-        @response
-          
-      end
-      
     end
 
   end

data/lib/marionette/version.rb

@@ -1,5 +1,5 @@
 module HeadStartApp
   module Marionette
-    VERSION = "0.0.6"
+    VERSION = "0.0.7"
   end  
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: marionette
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Dan Lee
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-11 00:00:00 -08:00
+date: 2011-01-12 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency