+1 been pending for too long
On 8 March 2011 10:28, James Turnbull <ja...@lovedthanlost.net> wrote:
> From: Paul Nasrat <pnas...@googlemail.com>
>
> The EC2 fact is completely broken at the moment:
>
> * Timeout::Error isn't caught by rescue (due to how it inherits)
> * The issue of wrong open semantics outlined here, this is causing hidden
> immediate failure
> * The fact is going to cause a 2 second wait to every facter run
>
> Whilst the following patch fixes the first two, I'm not sure we want to take
> the timeout hit, we also want to add tests as even simple ruby code can get
> logic errors such as the open().
>
> Signed-off-by: Paul Nasrat <pnas...@googlemail.com>
> Signed-off-by: James Turnbull <ja...@lovedthanlost.net>
> ---
> Local-branch: tickets/master/2346
> lib/facter/ec2.rb | 7 +++++--
> 1 files changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/lib/facter/ec2.rb b/lib/facter/ec2.rb
> index ef84757..ea29d14 100644
> --- a/lib/facter/ec2.rb
> +++ b/lib/facter/ec2.rb
> @@ -6,9 +6,12 @@ require 'open-uri'
> require 'timeout'
>
> def can_connect?(ip,port,wait_sec=2)
> - Timeout::timeout(wait_sec) {open(ip, port)}
> + url = "http://#{ip}:#{port}/";
> + Timeout::timeout(wait_sec) {open(url)}
> return true
> -rescue
> +rescue Timeout::Error
> + return false
> +rescue
> return false
> end
>
> --
> 1.7.1
>
> --
> You received this message because you are subscribed to the Google Groups
> "Puppet Developers" group.
> To post to this group, send email to puppet-dev@googlegroups.com.
> To unsubscribe from this group, send email to
> puppet-dev+unsubscr...@googlegroups.com.
> For more options, visit this group at
> http://groups.google.com/group/puppet-dev?hl=en.
>
>
--
You received this message because you are subscribed to the Google Groups
"Puppet Developers" group.
To post to this group, send email to puppet-dev@googlegroups.com.
To unsubscribe from this group, send email to
puppet-dev+unsubscr...@googlegroups.com.
For more options, visit this group at
http://groups.google.com/group/puppet-dev?hl=en.
