Changeset 1101

Timestamp:

Sep 8, 2012 10:30:30 AM (10 years ago)

Author:

jemian

Message:

report the UNIX timestamp, CA timestamp is more elusive, make sure only the new message is sent (not the continuing series of messages)

File:

• pvMail/src/PvMail/pvMail.py (modified) (5 diffs)

pvMail/src/PvMail/pvMail.py

@@ -107 +107 @@
         self.old_value = None
         self.monitoredPVs = []
+        self.ca_timestamp = None
     
     def basicChecks(self):
@@ -185 +186 @@
         if self.old_value == 0:
             if value == 1:
+                self.ca_timestamp = None
                 # Cannot use this definition:
                 #     self.trigger = (value == 1)
@@ -190 +192 @@
                 # to zero before SendMessage() runs.
                 self.trigger = True
+                pv = epics._MONITORS_[self.triggerPV]
+                self.ca_timestamp = pv.timestamp
+                # or epics.ca.get_timestamp(pv.chid)
                 SendMessage(self)
         self.old_value = value
@@ -201 +206 @@
         message = ''
         message += 'host: %s\n' % socket.gethostname()
-        message += 'date: %s\n' % datetime.datetime.now()
+        message += 'date: %s (UNIX, not PV)\n' % datetime.datetime.now()
         message += 'program: %s\n' % sys.argv[0]
         message += 'trigger PV: %s\n' % self.triggerPV
@@ -226 +231 @@
             pvm.subject = "pvMail.py: " + pvm.triggerPV
             
-            msg = pvm.message
+            #msg = pvm.message
+            msg = ''        # start with a new message
             msg += "\n\n"
             msg += 'user: %s\n' % os.environ['LOGNAME']
             msg += 'host: %s\n' % socket.gethostname()
-            msg += 'date: %s\n' % datetime.datetime.now()
+            msg += 'date: %s (UNIX, not PV)\n' % datetime.datetime.now()
+            if pvm.ca_timestamp not in ('None', 0):
+                msg += 'CA_timestamp: %d\n' % pvm.ca_timestamp
             msg += 'program: %s\n' % sys.argv[0]
             msg += 'PID: %d\n' % os.getpid()