Changeset 204 for trunk/RetroStatus

Timestamp:

11/27/05 22:00:38 (18 years ago)

Author:

Nicholas Riley

Message:

formatflowed.py: Removed; no longer used.

RetroStatus.py: Remove format=flowed support, it doesn't work nicely
with UTF-8 encoded email. Fix sendMail bugs; it works now. Handle
volumestart event on clients (parameter is misspelled). Standardize
RSS titles to be of the form "name: status". Fixed scriptcheckfailed
to pull out the requested disk and actually check for it (mounted or
not). Add an example of the aformentioned volumestart event variant.
Fixed repeated typo of StringIO.getvalue in event exception handler.

Location:

trunk/RetroStatus

Files:

• RetroStatus.py (modified) (8 diffs)
• formatflowed.py (deleted)

trunk/RetroStatus/RetroStatus.py

@@ -13 +13 @@
 from email.MIMEText import MIMEText
 from email.Utils import formataddr, formatdate
-from formatflowed import convertToFlowed
-import os, sys
+import os, re, sys
 import objc # XXX should switch to public DADiskMount/Eject functions
 objc.loadBundle('DiskManagement', globals(),
@@ -76 +75 @@
 
 def sendMail(subject, text):
-    message = MIMEText(convertToFlowed(text), 'plain; format=flowed')
+    message = MIMEText(text.encode('utf8'), _charset='utf8')
     message.set_unixfrom(FROM_ADDR)
     message['From'] = formataddr((FROM_NAME, FROM_ADDR))
-    message['To'] = TO_ADDR
+    message['To'] = ', '.join(TO_ADDR)
     message['Date'] = formatdate(localtime=True)
     message['Subject'] = subject
@@ -135 +134 @@
 def retrospectstart(autolaunchboolean): pass
 def scriptstart(scriptname, startdate): pass
-def volumestart(volumename): pass
+# yes, this really should be "remotetname"
+def volumestart(volumename, clientname='', remotetname=''): pass
 def volumeend(volumename, kbcopied, filecount, durationinseconds, backupdate,
               enddate, startdate, destinationname, clientname, scriptname,
@@ -143 +143 @@
     growlNotify(NOTIFICATION_BACKUP, scriptname,
                 '%s\n%s' % (volumename, volumeerrormessage))
-    addEvent(volumename, '%s\n\n%d file(s) copied; %d had errors.' %
-             (volumeerrormessage, filecount, fileerrorcount))
+    addEvent('%s: %s' % (volumename, volumeerrormessage),
+             '%d file(s) copied; %d had errors.' % (filecount, fileerrorcount))
 
 def mediarequest(mediatypestring, requestedmembername, mediaisknownboolean):
@@ -164 +164 @@
         growlNotify(NOTIFICATION_MEDIA, disk.volumeName(),
                     'Disk no longer in use: OK to swap')
-    addEvent('Completed: scriptname',
+    addEvent(scriptname + ': script completed',
              '%s; %s error(s)' % (scripterrormessage, errorcount))
 
 # XXX does this get sent when it's supposed to?
+# XXX if not, we could ask for quit on script end if Retrospect was started
+# XXX by a script, and lengthen the lookahead interval
 def scriptcheckfailed(scriptname, failuremessage, scheduledate):
-    disk = lastUsedDisk()
-    if not disk or not diskIsMounted(disk):
+    failuremessage = failuremessage.replace('\r', '\n').decode('macroman')
+    m = re.search(u'\u201c([^\u201d]+)\u201d', failuremessage)
+    if not m:
+        addEvent(scriptname + ': check failed', failuremessage)
+        return
+    if not diskWithName(m.group(1)):
         sendMail("Please swap backup media before %s" % scheduledate.ctime(),
-                 "%s\nEject the old disk, if any, and check that the correct disk is inserted." % failuremessage.replace('\r', '\n'))
+                 failuremessage + "\n\nEject the old disk, if any, and check that the correct disk is inserted.")
 
 def retrospectquit():
@@ -185 +191 @@
                                                  in params.iteritems()]))
     if not eventHandler:
-        addEvent('Unhandled Retrospect event', eventStr)
+        addEvent('%s: unhandled event' % eventName, eventStr)
         if DEBUG: NSLog('unhandled event: ' + eventStr)
         return
@@ -193 +199 @@
         s = StringIO()
         print_exc(file=s)
-        addEvent('Retrospect event handler failed',
-                 '%s\n\n%s' % (eventStr, s.getval()), True)
+        addEvent('%s: event handler failed' % eventName,
+                 '%s\n\n%s' % (eventStr, s.getvalue()), True)
         if DEBUG:
-            NSLog('event handler failed for %s:\n%s' % (eventStr, s.getval())
+            NSLog('event handler failed for %s:\n%s' % (eventStr, s.getvalue()))
 
 installeventhandler(handleEvent, 'ascrpsbr',
@@ -215 +221 @@
 # scriptstart(scriptname='Boston Backup', startdate=datetime.datetime(2005, 11, 23, 2, 31, 51))
 # volumestart(volumename='Backup Clients:Babs')
+
 # volumeend(startdate=datetime.datetime(2005, 11, 23, 2, 31, 51), kbcopied=0, enddate=datetime.datetime(2005, 11, 23, 2, 32, 5), backuptypestring='Normal', volumename='Backup Clients:Babs', clientname='Babs', destinationname='Boston backup A', scriptname='Boston Backup', volumeerrormessage='client is not visible on network', backupdate=datetime.datetime(2005, 11, 23, 2, 32, 5), durationinseconds=0, volumeerrorcode=-1028, fileerrorcount=0, remotename='Babs', filecount=0, zonename='10.0.0.9')
 # volumestart(volumename=' Local Desktop:Bookworm')
+# volumestart(volumename='Backup Clients:Concord:Mac OS X', remotetname='Backup Clients:Concord', clientname='Backup Clients:Concord')
 # mediarequest: appears even if media is available
 # mediarequest(mediatypestring='disk', requestedmembername='1-Boston backup A', mediaisknownboolean=True)