Make display of shortcut box nicer

[build-farm.git] / mail-dead-hosts.py

diff --git a/mail-dead-hosts.py b/mail-dead-hosts.py
index f9a58074360b1a08470832736a2d3bb18ee110ec..fada47eebf3ad0eaad65d71c793e37c6ae37e656 100755 (executable)
--- a/mail-dead-hosts.py
+++ b/mail-dead-hosts.py
@@ -17,9 +17,8 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from buildfarm import (
-    BuildFarm,
-    )
+from buildfarm import BuildFarm
+from buildfarm.web import host_uri
 import optparse
 import smtplib
 from email.MIMEText import MIMEText
@@ -29,13 +28,12 @@ parser = optparse.OptionParser()
 parser.add_option("--dry-run", help="Don't actually send any emails.", action="store_true")
 (opts, args) = parser.parse_args()
 
-buildfarm = BuildFarm()
-db = buildfarm.hostdb
+buildfarm = BuildFarm(timeout=40.0)
 
 smtp = smtplib.SMTP()
 smtp.connect()
 
-hosts = db.dead_hosts(7 * 86400)
+hosts = buildfarm.hostdb.dead_hosts(7 * 86400)
 for host in hosts:
     if host.last_update:
         last_update = time.strftime("%a %b %e %H:%M:%S %Y", time.gmtime(host.last_update))
@@ -44,7 +42,7 @@ for host in hosts:
 
     body = """
 Your host %s has been part of the Samba Build farm, hosted
-at http://build.samba.org.
+at http://build.samba.org/.
 
 Sadly however we have not heard from it since %s.
 
@@ -55,14 +53,13 @@ why we have not heard from your host?
 If you no longer wish your host to participate in the Samba Build
 Farm, then please let us know so we can remove its records.
 
-You can see the summary for your host at:
-http://build.samba.org/?function=View+Host;host=%s
+You can see the summary for your host at: %s
 
 Thanks,
 
 The Build Farm administration team.
 
-""" % (host.name, last_update, host.name)
+""" % (host.name, last_update, host_uri("http://build.samba.org/build.cgi", host.name))
 
     msg = MIMEText(body)
 
@@ -70,10 +67,12 @@ The Build Farm administration team.
     msg["Subject"] ="Your build farm host %s appears dead" % host.name
     msg["From"] = "\"Samba Build Farm\" <build@samba.org>"
     msg["To"] = "\"%s\" <%s>" % host.owner
+    msg["Bcc"] = "\"Samba Build Farm\" <build@samba.org>"
 
     if opts.dry_run:
         print msg.as_string()
     else:
-        smtp.send(msg["From"], [msg["To"]], msg.as_string())
-        db.sent_dead_mail(host.name)
+        smtp.sendmail(msg["From"], [msg["To"], msg["Bcc"]], msg.as_string())
+        host.dead_mail_sent()
+buildfarm.commit()
 smtp.quit()