From d44762c6045e4ebac37bbd87887811b65f49e340 Mon Sep 17 00:00:00 2001 From: Patrick J Cherry Date: Tue, 20 Nov 2012 11:27:36 +0000 Subject: Adjusted regexs to be anchored at the beginning of the line, and expect just one word before "must". --- lib/custodian/parser.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/custodian/parser.rb b/lib/custodian/parser.rb index 913fec7..045711d 100644 --- a/lib/custodian/parser.rb +++ b/lib/custodian/parser.rb @@ -257,7 +257,7 @@ class MonitorConfig elsif ( line =~ /^([0-9A-Z_]+)\s+(is|are)\s+/ ) define_macro( line ) - elsif ( line =~ /(.*)\s+must\s+ping(.*)/ ) + elsif ( line =~ /^(\S+)\s+must\s+ping(.*)/ ) # # Ping is a special case because the configuration file entry @@ -280,7 +280,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+\s+must\s+run\s+([^\s]+)(\s+|\.|$)/i ) # # Get the service we're testing, and remove any trailing "." -- cgit v1.2.1