From 85fef63889ca60329493583988affe67b59d143d Mon Sep 17 00:00:00 2001 From: luke Date: Mon, 14 May 2007 16:04:12 +0000 Subject: fixing some problems with the config timeout -- I am not sure it ever actually worked git-svn-id: https://reductivelabs.com/svn/puppet/trunk@2512 980ebf18-57e1-0310-9a29-db15c13687c0 --- lib/puppet/network/client/master.rb | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/puppet/network/client/master.rb b/lib/puppet/network/client/master.rb index e358a1d55..6db2e98c7 100644 --- a/lib/puppet/network/client/master.rb +++ b/lib/puppet/network/client/master.rb @@ -483,11 +483,11 @@ class Puppet::Network::Client::Master < Puppet::Network::Client end def self.timeout - @timeout = Puppet[:configtimeout] - case @timeout + timeout = Puppet[:configtimeout] + case timeout when String: - if @timeout =~ /^\d+$/ - @timeout = Integer(@timeout) + if timeout =~ /^\d+$/ + timeout = Integer(timeout) else raise ArgumentError, "Configuration timeout must be an integer" end @@ -495,6 +495,8 @@ class Puppet::Network::Client::Master < Puppet::Network::Client else raise ArgumentError, "Configuration timeout must be an integer" end + + return timeout end # Send off the transaction report. -- cgit