[CalendarServer-changes] [2777] CalendarServer/branches/users/sagen/mailgateway-implicit-2745/ twistedcaldav/mail.py

[source_changes at macosforge.org]

Revision: 2777
          http://trac.macosforge.org/projects/calendarserver/changeset/2777
Author:   sagen at apple.com
Date:     2008-08-06 15:10:26 -0700 (Wed, 06 Aug 2008)
Log Message:
-----------
Logging of various bogus email conditions

Modified Paths:
--------------
    CalendarServer/branches/users/sagen/mailgateway-implicit-2745/twistedcaldav/mail.py

Modified: CalendarServer/branches/users/sagen/mailgateway-implicit-2745/twistedcaldav/mail.py
===================================================================
--- CalendarServer/branches/users/sagen/mailgateway-implicit-2745/twistedcaldav/mail.py	2008-08-06 21:58:12 UTC (rev 2776)
+++ CalendarServer/branches/users/sagen/mailgateway-implicit-2745/twistedcaldav/mail.py	2008-08-06 22:10:26 UTC (rev 2777)
@@ -490,10 +490,10 @@
                 pre, post = addr.split('@')
                 pre, token = pre.split('+')
             except ValueError:
-                # TODO: handle this error
+                self.log_error("Mail gateway didn't find a token in message %s (%s)" % (parsedMessage['Message-ID'], parsedMessage['To']))
                 return
         else:
-            # TODO: handle this error
+            self.log_error("Mail gateway couldn't parse To: address (%s) in message %s" % (parsedMessage['To'], parsedMessage['Message-ID']))
             return
 
         for part in parsedMessage.walk():
@@ -501,8 +501,8 @@
                 calBody = part.get_payload(decode=True)
                 break
         else:
-            # TODO: handle this condition
             # No icalendear attachment
+            self.log_error("Mail gateway didn't find an icalendar attachment in message %s" % (parsedMessage['Message-ID'],))
             return
 
         self.log_debug(calBody)
@@ -512,8 +512,9 @@
         result = self.db.lookupByToken(token)
         if result is None:
             # This isn't a token we recognize
-            self.error("Received a token I don't recognize: %s" % (token,))
+            self.log_error("Mail gateway found a token (%s) but didn't recognize it in message %s" % (token, parsedMessage['Message-ID']))
             return
+
         organizer, attendee = result
         organizer = str(organizer)
         attendee = str(attendee)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080806/dd93eb33/attachment-0001.html