*** empty log message ***

[monitor.git] / mailer.py

diff --git a/mailer.py b/mailer.py
index 9ea66f7..8df3b98 100755 (executable)
--- a/mailer.py
+++ b/mailer.py
@@ -6,25 +6,13 @@
 #
 # $Id: $
 from emailTxt import *
-import xml, xmlrpclib
 import smtplib
+import config
 
 MTA="localhost"
 FROM="support@planet-lab.org"
 
-XMLRPC_SERVER = 'https://www.planet-lab.org/PLCAPI/'
-
-def siteId(hostname):
-       api = xmlrpclib.Server(XMLRPC_SERVER, verbose=False)
-       anon = {'AuthMethod': "anonymous"}
-       site_id = api.AnonAdmQuerySite (anon, {"node_hostname": hostname})
-       if len(site_id) == 1:  
-               loginbase = api.AnonAdmGetSites (anon, site_id, ["login_base"])
-               return loginbase[0]['login_base']
-       else:
-               raise "Unknown host" 
-
-def email (subject, text, to, cc = None):
+def email (subject, text, to):
        """Create a mime-message that will render HTML in popular
        MUAs, text in better ones"""
        import MimeWriter
@@ -41,8 +29,16 @@ def email (subject, text, to, cc = None):
        # message body
        #
        writer.addheader("Subject", subject)
-       writer.addheader("To", to)
-       if cc: writer.addheader("CC", cc)
+       if to.__class__ == [].__class__ :       
+               writer.addheader("To", to[0])
+               cc = ""
+               for dest in to[1:len(to)]:
+                       cc +="%s, " % dest
+               cc = cc.rstrip(", ") 
+               writer.addheader("CC", cc)
+       else:
+               writer.addheader("To", to)
+               
        writer.addheader("MIME-Version", "1.0")
        #
        # start the multipart section of the message
@@ -66,13 +62,19 @@ def email (subject, text, to, cc = None):
        writer.lastpart()
        msg = out.getvalue()
        out.close()
-
-       server = smtplib.SMTP(MTA)
-       server.sendmail(FROM, (to,cc), msg)
-       server.quit()
+       if not config.debug:
+               server = smtplib.SMTP(MTA)
+               server.sendmail(FROM, to,  msg)
+               server.quit()
 
 if __name__=="__main__":
-   import smtplib
-   import emailTxt
-
-   email('DISREGARD', emailTxt.mailtxt.STANDARD % {'hostname': "ALICE.cs.princeton.edu"}, "tech-" + siteId("alice.cs.princeton.edu") + "@sites.planet-lab.org")
+       import smtplib
+       import emailTxt
+       import plc 
+       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")
+       #else:
+       #       print "No dice."
+       #email("TEST109", "THIS IS A TEST", ["faiyaza@cs.princeton.edu", "faiyaz@winlab.rutgers.edu", "faiyaza@gmail.com"])