Differentiating between a mail problem and jobs not being run.

1 files changed, 9 insertions, 1 deletions

diff --git a/jobs/PeerChecker.py b/jobs/PeerChecker.py
index 965f4a4..f17da53 100755
--- a/jobs/PeerChecker.py
+++ b/jobs/PeerChecker.py
@@ -31,10 +31,18 @@ class PeerChecker(JobBase.JobBase):
                 else:

                     if "True" in response.content:

                         peerOK = True

-                    elif "False" in response.content:

+                    elif "MailProblem" in response.content:

                         peerOK = False

                         subject = peer[0] + " reports it cannot send email."

                         body = str(response.status_code) + "\n" + response.content

+                    elif "JobProblem" in response.content:

+                        peerOK = False

+                        subject = peer[0] + " reports its jobs are not running."

+                        body = str(response.status_code) + "\n" + response.content

+                    else:

+                        peerOK = False

+                        subject = peer[0] + " had an unexpected response."

+                        body = str(response.status_code) + "\n" + response.content

             except Exception as e:

                 peerOK = False

                 subject = peer[0] + " is not responding."