From e4373a5f10d50b22227ef2f0e35123dcdb6a414a Mon Sep 17 00:00:00 2001 From: Sergey Ivanov <seriv@omnia.spectr.org> Date: Fri, 1 Oct 2021 16:40:19 -0400 Subject: [PATCH] generalize previous commit --- lib/Site/ZpoolScrub.pm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/Site/ZpoolScrub.pm b/lib/Site/ZpoolScrub.pm index 47e18b1..68f1753 100644 --- a/lib/Site/ZpoolScrub.pm +++ b/lib/Site/ZpoolScrub.pm @@ -122,7 +122,7 @@ sub handler { $errors = 0; $canceled = 1; } - elsif (/^\s*scan:\s+scrub\s+repaired\s+(\d*)\D*\s+in\s+(\d*)\s+days\s+(\d*):(\d*):(\d*)\s+with\s+(\d*)\s+errors\s+on\s+(.+)$/){ + elsif (/^\s*scan:\s+scrub\s+repaired\s+(\d*B*)\D*\s+in\s+(\d*)\s+days\s+(\d*):(\d*):(\d*)\s+with\s+(\d*)\s+errors\s+on\s+(.+)$/){ ($repaired,$days,$h,$m,$s,$errors,$when) = ($1,$2,$3,$4,$5,$6,$7); $when = `$DATE '+%s'` - `$DATE '+%s' -d "$when"`; $howlong = $m+60*($h+24*$days); @@ -148,20 +148,20 @@ sub handler { $when /= 60; $when = int($when); } - elsif ( (/^\s*\S+\s+scanned.*,\s+(\d+)h(\d+)m\s+to\s+go\s*$/) or - (/^\s*\S+\s+resilvered.*,\s+(\d+)h(\d+)m\s+to\s+go\s*$/) + elsif ( (/^\s*\S+B*\s+scanned.*,\s+(\d+)h(\d+)m\s+to\s+go\s*$/) or + (/^\s*\S+B*\s+resilvered.*,\s+(\d+)h(\d+)m\s+to\s+go\s*$/) ){ $togo = $1*60 +$2; $howlong = $oldhowlong; } - elsif ( (/^\s*\S+\s+scanned.*,\s+(\d+)\s+days\s+(\d+):(\d+):(\d+)\s+to\s+go\s*$/) or - (/^\s*\S+\s+resilvered.*,\s+(\d+)\s+days\s+(\d+):(\d+):(\d+)\s+to\s+go\s*$/) + elsif ( (/^\s*\S+B*\s+scanned.*,\s+(\d+)\s+days\s+(\d+):(\d+):(\d+)\s+to\s+go\s*$/) or + (/^\s*\S+B*\s+resilvered.*,\s+(\d+)\s+days\s+(\d+):(\d+):(\d+)\s+to\s+go\s*$/) ){ $togo = ($1*24 + $2)*60 +$3; $howlong = $oldhowlong; } - elsif ( (/^\s*(\d+)\s+repaired,/) or - (/^\s*(\d+)\s+resilvered,/) + elsif ( (/^\s*(\d+B*)\s+repaired,/) or + (/^\s*(\d+B*)\s+resilvered,/) ){ $repaired = $1; } -- GitLab