From d02a96a7140ebd7f85fbf06f5b8724f8b79ec1f8 Mon Sep 17 00:00:00 2001
From: Per Cederqvist <ceder@lysator.liu.se>
Date: Wed, 10 Jan 2007 12:48:22 +0000
Subject: [PATCH] Fix the recovery strings.
---
check_nfs_server | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/check_nfs_server b/check_nfs_server
index 1975bf1..90a6ea9 100755
--- a/check_nfs_server
+++ b/check_nfs_server
@@ -18,8 +18,8 @@ import os
import sys
import re
-bad_re = re.compile("(NFS|nfs:) server (?P<bad>[^ ]*) not responding")
-good_re = re.compile("NFS server ([^ ]*) OK")
+bad_re = re.compile("(NFS|nfs:) server (?P<server>[^ ]*) not responding")
+good_re = re.compile("NFS server (?P<server>[^ ]*) (ok|OK)")
time_re = re.compile("((?P<year>[1-9][0-9]{3})-"
"(?P<mon>[0-9]{2})-"
"(?P<day>[0-9]{2}) "
@@ -66,12 +66,12 @@ def checkfile(fn, now):
bad = bad_re.search(line)
if bad is not None:
- res[bad.group("bad")] = res.get(bad.group(1), 0) + 1
+ res[bad.group("server")] = res.get(bad.group(1), 0) + 1
continue
good = good_re.search(line)
- if good is not None:
- del res[bad.group(1)]
+ if good is not None and good.group("server") in res:
+ del res[good.group("server")]
return res
--
GitLab