[Mon-commit] mon mon,1.22.2.2,1.22.2.3
Brought to you by:
trockij
From: Augie S. <as...@us...> - 2007-12-05 17:55:03
|
Update of /cvsroot/mon/mon In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv6685 Modified Files: Tag: mon-1-2-branch mon Log Message: Checking in Jim's patch for syslog dying in eval. Index: mon =================================================================== RCS file: /cvsroot/mon/mon/mon,v retrieving revision 1.22.2.2 retrieving revision 1.22.2.3 diff -C2 -d -r1.22.2.2 -r1.22.2.3 *** mon 6 Jun 2007 11:46:19 -0000 1.22.2.2 --- mon 5 Dec 2007 17:54:55 -0000 1.22.2.3 *************** *** 5393,5401 **** no warnings; # Redefining syslog sub syslog { ! eval { ! local $SIG{"__DIE__"}= sub { }; ! my @log = map { s/\%//mg; } @_; ! Sys::Syslog::syslog(@log); ! } } use warnings; --- 5393,5403 ---- no warnings; # Redefining syslog sub syslog { ! return if (!@_); ! ! my $pri = (@_ == 1) ? "err" : shift; ! ! eval { Sys::Syslog::syslog ($pri, '%s', "@_"); }; ! ! print STDERR "syslog error: $@\n" if ($@ ne ""); } use warnings; |