Changeset 1092

Timestamp:

Sep 7, 2012 1:40:02 PM (10 years ago)

Author:

jemian

Message:

new home for documentation
test that sendmail program is available

Location:

pvMail

Files:

• doc/source/index.rst (modified) (1 diff)
• doc/source/info.rst (modified) (1 diff)
• pvMail.py (modified) (1 diff)
• src/PvMail/pvMail.py (modified) (3 diffs)

pvMail/doc/source/index.rst

@@ -4 +4 @@
 ==================================
 
-https://subversion.xray.aps.anl.gov/admin-bcdaext/pvMail
+http://subversion.xray.aps.anl.gov/admin_bcdaext/pvMail
 
 PvMail was built to watch (monitor) an EPICS PV and send an email

pvMail/doc/source/info.rst

@@ -34 +34 @@
 maintained using sphinx (http://sphinx.pocoo.org),
 can be accessed from the WWW at
-https://subversion.xray.aps.anl.gov/bcdaext/pvMail/doc/build/html/index.html
+http://subversion.xray.aps.anl.gov/admin_bcdaext/pvMail
 :index:`PvMail project`
 and also  

pvMail/pvMail.py

@@ -5 +5 @@
 
 Documentation:
-    https://subversion.xray.aps.anl.gov/bcdaext/pvMail/doc/build/html/index.html
+    http://subversion.xray.aps.anl.gov/admin_bcdaext/pvMail
 
 see the help option for immediate details about the command-line::

pvMail/src/PvMail/pvMail.py

@@ -81 +81 @@
 __institution__ = "Advanced Photon Source, Argonne National Laboratory"
 __author_email__= "jemian@anl.gov"
-__url__ = "https://subversion.xray.aps.anl.gov/trac/bcdaext/wiki/pvMail"
+__url__ = "http://subversion.xray.aps.anl.gov/admin_bcdaext/pvMail"
 __license__ = "(c) 2009-2012, UChicago Argonne, LLC"
 __license__ += " (see LICENSE file for details)"
@@ -255 +255 @@
     global gui_object
     
+    email_program = '/usr/lib/sendmail'
     from_addr = sys.argv[0]
     to_addr = str(" ".join(recipients))
-    mailprogram = "/usr/lib/sendmail -F %s -t %s" % (from_addr, to_addr)
+    mailprogram = "%s -F %s -t %s" % (email_program, from_addr, to_addr)
     mail_command = [mailprogram, "Subject: "+subject, message]
     cmd = '''cat << +++ | %s\n+++''' % "\n".join(mail_command)
@@ -268 +269 @@
     try:
         logger( "email command:\n" + cmd )
-        os.popen(cmd)    # send the message
+        if os.path.exists(email_program):
+            os.popen(cmd)    # send the message
+        else:
+            logger( 'email program (%s) does not exist' % email_program )
     except:
         err_msg = traceback.format_exc()