Changeset 658

Timestamp:

Nov 25, 2011 8:14:28 PM (14 years ago)

Author:

jemian

Message:

revise sendMail() and change name of log file, based on pid

Location:

pvMail/src/pyEpics

Files:

• . (modified) (1 prop)
• pvMail.py (modified) (4 diffs)

pvMail/src/pyEpics ¶

@@ -1 @@
-pvMail.log
+*.log
 pvMail_email.txt
 

@@ -1 @@
-pvMail.log
+*.log
 pvMail_email.txt
 

pvMail/src/pyEpics/pvMail.py ¶

@@ -60 +60 @@
 import logging
 import os
-import shlex
 import socket
-import subprocess
 import sys
 import time
 
 
+__description__ = "Watch an EPICS PV. Send email when it changes from 0 to 1."
 __version__ = "3.0a." + "$Rev$".split(" ")[1]
 __svnid__ = "$Id$"
-__description__ = "Watch an EPICS PV. Send email when it changes from 0 to 1."
-LOG_FILE = "pvMail.log"
+__license__ = "(c) 2009-2012, UChicago Argonne, LLC, BSD-style license, see LICENSE file for details"
+
+LOG_FILE = "pvMail-%d.log" % os.getpid()
 MESSAGE_FILE = "pvmail_email.txt"
 RETRY_INTERVAL_S = 0.2
@@ -206 +206 @@
         '''
         logger("send_test_message")
-        self.recipients = ["prjemian@gmail.com"]
+        self.recipients = ["jemian", "prjemian"]
         self.message = "this is a test\n\n" + self.addMessageTail()
         self.subject = "pvMail development test"
@@ -222 +222 @@
     messageFile = "/tmp/pvmail_message.txt"
     logger("sending email to: " + ", ".join(recipients))
-    # send the message
+    
+    # write the message to a file
+    # TODO: how can we avoid writing a temporary file?
     pvMailMsg = open(messageFile, "w")
     pvMailMsg.write(message)
     pvMailMsg.close()
 
+    # send the message
     cmd_fmt = '''mail -s "%s" %s < %s'''
-    for who in recipients:
-        # send a message to each recipient
-        cmd = cmd_fmt % ( subject, who, messageFile )
-        logger( cmd )
-        os.popen(cmd)   # for now
-        # popen is deprecated since Python 2.6
-        # use subprocess module instead
-        
-        # THIS DOES NOT WORK CORRECTLY!  
-        #sends mail to /tmp/pvmail_message.txt with no message
-        #args = shlex.split(cmd)
-        #subprocess.call(args)  
+    cmd = cmd_fmt % ( subject, " ".join(recipients), messageFile )
+    logger( cmd )
+    os.popen(cmd)
+    # popen is deprecated since Python 2.6
+    # use subprocess module instead
+    
+    # THIS DOES NOT WORK CORRECTLY!  
+    #sends mail to /tmp/pvmail_message.txt with no message
+    #args = shlex.split(cmd)
+    #subprocess.call(args)  
 
 
@@ -272 +273 @@
             report_time = time.time() + 5.0
             logger("time remaining: %.1f seconds ..." % (end_time - time.time()))
-        time.sleep(retry_interval_s)
+        time.sleep(retry_interval_s)
     pvm.doStop()
 

@@ -1 @@
-pvMail.log
+*.log
 pvMail_email.txt