[Mon-commit] mon mon,1.2,1.3

[David N. <vi...@us...>]

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

Modified Files:
	mon 
Log Message:
Moving set_op_status call to before do_alert, so upalerts will get the
correct information in the MON_OPSTATUS environment variable.

Also, re-adding an else clause during auth.cf parsing that prevents 
bogus entries from being read into the configuration.


Index: mon
===================================================================
RCS file: /cvsroot/mon/mon/mon,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** mon	11 Jun 2004 14:55:55 -0000	1.2
--- mon	11 Jun 2004 15:50:38 -0000	1.3
***************
*** 2903,2906 ****
--- 2903,2908 ----
  	    }
  
+ 	    set_op_status ($group, $service, $STAT_OK);
+ 
  	    #
  	    # if this service has just come back up and
***************
*** 2960,2964 ****
  	    $sref->{"_last_success"} = $tmnow;
  
- 	    set_op_status ($group, $service, $STAT_OK);
  	}
  
--- 2962,2965 ----
***************
*** 3540,3543 ****
--- 3541,3547 ----
  		syslog ('err', "invalid host in $CF{AUTHFILE}, line $.");
  		next;
+ 	    } else {
+ 	    	syslog ('err', "invalid host in $CF{AUTHFILE}, line $.");
+ 		next;
  	    }