[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, experimental, updated. debian/2.6.8-1-844-g7ec39d5

[Brice Figureau]

The following commit has been merged in the experimental branch:
commit f2537d8f913ff78f5198dabd43727660010a4480
Author: Brice Figureau <brice-puppet at daysofwonder.com>
Date:   Sun Oct 17 16:06:50 2010 +0200

    Puppet-load: better and safer error reporting
    
    In case of connection, dns or timeout error, puppet-load would not report
    the error correctly or could crash.
    
    Signed-off-by: Brice Figureau <brice-puppet at daysofwonder.com>

diff --git a/ext/puppet-load.rb b/ext/puppet-load.rb
index 24437c1..35bee6e 100644
--- a/ext/puppet-load.rb
+++ b/ext/puppet-load.rb
@@ -265,6 +265,8 @@ class RequestPool
   end
 
   def spawn_request(index)
+    @times[index] = Time.now
+    @sizes[index] = 0
     nodeidx = index % $options[:node].size
     node = $options[:node][nodeidx]
     EventMachine::HttpRequest.new("https://#{$options[:server]}:#{$options[:masterport]}/production/catalog/#{node}").get(
@@ -302,7 +304,7 @@ class RequestPool
     }
 
     conn.errback {
-      Puppet.debug("Client #{index} finished with an error: #{conn.response.error}")
+      Puppet.debug("Client #{index} finished with an error: #{conn.error}")
       @times[index] = Time.now - @times[index]
       @responses[:failed].push(conn)
       check_progress

-- 
Puppet packaging for Debian