diff options
| author | Steve Kemp <steve@steve.org.uk> | 2012-11-14 16:56:46 +0000 |
|---|---|---|
| committer | Steve Kemp <steve@steve.org.uk> | 2012-11-14 16:56:46 +0000 |
| commit | cd42f83711a5b112003ad1eb9042cafc6bd28794 (patch) | |
| tree | 5d5ed3bbc1b1dfa83336fabd7af081f23ef9cada /lib | |
| parent | f0f0e01562339ed94eddee6eb13e92b8f17b6acc (diff) | |
Change default timeout to 10 seconds.
Diffstat (limited to 'lib')
| -rwxr-xr-x | lib/custodian/parser.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/custodian/parser.rb b/lib/custodian/parser.rb index a5ce584..38792d2 100755 --- a/lib/custodian/parser.rb +++ b/lib/custodian/parser.rb @@ -62,7 +62,7 @@ class MonitorConfig @MACROS = Hash.new() @queue = Beanstalk::Pool.new(['127.0.0.1:11300']) @file = filename - @timeout = 3 + @timeout = 10 raise ArgumentError, "Missing configuration file!" if ( @file.nil? ) raise ArgumentError, "File not found: #{@file}" unless ( File.exists?( @file) ) @@ -272,7 +272,7 @@ class MonitorConfig new_line = "#{pre} must run ping #{post}" return( parse_line( new_line ) ) - elsif ( line =~ /\s+must\s+run\s+([^\s]+)(\s+|\.)/i ) + elsif ( line =~ /\s+must\s+run\s+([^\s]+)(\s+|\.|$)/i ) # # Get the service we're testing, and remove any trailing "." |