[tor-commits] [doctor/master] Use stem descriptor downloader for health check

[atagar at torproject.org]

commit df504cd1b96c15f9f09623f8baff1966ee9b3a7c
Author: Damian Johnson <atagar at torproject.org>
Date:   Wed Apr 25 12:38:54 2018 -0700

    Use stem descriptor downloader for health check
    
    Now that Stem can download descriptors from an ORPort this health check can be
    quite a bit nicer.
---
 relay_check.py | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/relay_check.py b/relay_check.py
index 2a40179..140ca01 100755
--- a/relay_check.py
+++ b/relay_check.py
@@ -4,14 +4,14 @@
 
 """
 Health checks for your relay. This provides a simple email notification when
-your relay has become unavailable.
+your relay becomes unavailable.
 """
 
 import smtplib
 import traceback
 
 import stem
-import stem.client
+import stem.descriptor.remote
 
 from email.mime.multipart import MIMEMultipart
 from email.mime.text import MIMEText
@@ -27,14 +27,12 @@ RELAY_LINK = 'https://metrics.torproject.org/rs.html#details/%s' % RELAY_FINGERP
 
 def main():
   try:
-    with stem.client.Relay.connect(RELAY_ADDRESS, RELAY_OR_PORT, [3]) as relay:
-      circ = relay.create_circuit()
-      circ.send('RELAY_BEGIN_DIR', stream_id = 1)
-      our_descriptor = circ.send('RELAY_DATA', 'GET /tor/server/authority HTTP/1.0\r\n\r\n', stream_id = 1).data
-      circ.close()
-
-      if 'router %s %s %s' % (RELAY_NAME, RELAY_ADDRESS, RELAY_OR_PORT) not in our_descriptor:
-        email('Unable to fetch %s descriptor' % RELAY_NAME, "Unable to retrieve the descriptor of %s (%s):\n\n%s" % (RELAY_NAME, RELAY_LINK, our_descriptor))
+    desc = list(stem.descriptor.remote.their_server_descriptor(
+      endpoints = [stem.ORPort(RELAY_ADDRESS, RELAY_OR_PORT)],
+    ))[0]
+
+    if desc.nickname != RELAY_NAME:
+      raise ValueError('Unexpected descriptor:\n\n%s' % desc)
   except stem.SocketError:
     email('Unable to reach %s' % RELAY_NAME, "Unable to reach %s (%s):\n\n%s" % (RELAY_NAME, RELAY_LINK, traceback.format_exc()))
 
@@ -56,7 +54,7 @@ def email(subject, body):
   msg.attach(MIMEText(body, 'plain'))
 
   server = smtplib.SMTP('localhost')
-  server.sendmail(FROM_ADDRESS, destinations, msg.as_string())
+  server.sendmail('no-rely at torproject.com', [EMAIL_ADDRESS], msg.as_string())
   server.quit()