michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fail more gracefully if regexp is invalid

Browse Source
This commit is contained in:
Jamie Cameron
2020-05-30 20:29:04 -07:00
parent 2807def400
commit 9a64b24a41
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
status/exec-monitor.pl
View File

@@ -7,10 +7,14 @@ my $re = $_[0]->{'regexp'};
if ($re ne '') { if ($re ne '') {
# Get output and compare # Get output and compare
my $out = &backquote_logged("($_[0]->{'cmd'}) 2>&1 </dev/null"); my $out = &backquote_logged("($_[0]->{'cmd'}) 2>&1 </dev/null");
if ($_[0]->{'remode'} == 0 && $out !~ /$re/) { my $match = eval { $out =~ /$re/ };
if ($@) {
return { 'up' => -1, 'desc' => $@ };
}
elsif ($_[0]->{'remode'} == 0 && !$match) {
return { 'up' => 0 }; return { 'up' => 0 };
} }
elsif ($_[0]->{'remode'} == 1 && $out =~ /$re/) { elsif ($_[0]->{'remode'} == 1 && $match) {
return { 'up' => 0 }; return { 'up' => 0 };
} }
} }