- set API URL to www.planet-lab.org

[monitor.git] / mailer.py

diff --git a/mailer.py b/mailer.py
index 8df3b98..7d0b28f 100755 (executable)
--- a/mailer.py
+++ b/mailer.py
@@ -4,7 +4,7 @@
 #
 # Faiyaz Ahmed <faiyaza@cs.princeton.edu>
 #
-# $Id: $
+# $Id: mailer.py,v 1.5 2007/01/17 16:03:30 faiyaza Exp $
 from emailTxt import *
 import smtplib
 import config
@@ -63,15 +63,18 @@ def email (subject, text, to):
        msg = out.getvalue()
        out.close()
        if not config.debug:
-               server = smtplib.SMTP(MTA)
-               server.sendmail(FROM, to,  msg)
-               server.quit()
+               try:
+                       server = smtplib.SMTP(MTA)
+                       server.sendmail(FROM, to,  msg)
+                       server.quit()
+               except Exception, err:
+                       print "Mailer error: %s" % err
 
 if __name__=="__main__":
        import smtplib
        import emailTxt
        import plc 
-       id = plc.siteId("alice.cs.princeton.edu")
+       id = plc.siteId(["alice.cs.princeton.edu"])
        print id
        #if id:
                #email('TEST', emailTxt.mailtxt.ssh % {'hostname': "ALICE.cs.princeton.edu"}, "tech-" + id + "@sites.planet-lab.org")