[Mon-commit] mon mon,1.4.2.12,1.4.2.13

[Jim T. <tr...@us...>]

Update of /cvsroot/mon/mon
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9747

Modified Files:
      Tag: mon-1-0-0pre1
	mon 
Log Message:
carp about duplicate services and periods

Index: mon
===================================================================
RCS file: /cvsroot/mon/mon/mon,v
retrieving revision 1.4.2.12
retrieving revision 1.4.2.13
diff -C2 -d -r1.4.2.12 -r1.4.2.13
*** mon	11 Aug 2004 20:40:27 -0000	1.4.2.12
--- mon	13 Aug 2004 04:15:16 -0000	1.4.2.13
***************
*** 1169,1172 ****
--- 1169,1178 ----
  		}
  
+ 		elsif (exists $new_watch{$watchgroup}->{$service})
+ 		{
+ 		    close (CFG);
+ 		    return "cf error: service $service already defined for watch group $watchgroup, line $line_num";
+ 		}
+ 
  		$period = 0;
  		$sref = \%{$new_watch{$watchgroup}->{$service}};
***************
*** 1241,1244 ****
--- 1247,1256 ----
  		}
  
+ 		if (exists $sref->{"periods"}->{$periodstr})
+ 		{
+ 		    close (CFG);
+ 		    return "cf error: period '$periodstr' already defined for watch group $watchgroup service $service, line $line_num";
+ 		}
+ 
  		$pref = \%{$sref->{"periods"}->{$periodstr}};