Changeset 87

Timestamp:

06/22/06 14:13:42 (17 years ago)

Author:

bas

Message:

EmailtoTracScript?:

email2trac.py.in:

• added enable_syslog option
• fixed an error in unicode converting
• Fixed some layout code

Location:

emailtotracscript/trunk

Files:

• ChangeLog (modified) (1 diff)
• INSTALL (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• email2trac.conf (modified) (1 diff)
• email2trac.py.in (modified) (9 diffs)

emailtotracscript/trunk/ChangeLog

@@ -3 +3 @@
           the database connection.
           Fixed by: Walter de Jong en Bas van der Vlies
+
+        - Added enable_syslog option. If enabled log errors
+          to syslog instead of stderr. If enabled no errors are
+          send back to the user.
+          Implemented by: Bas van der Vlies
+
+        - Fixed an error with updating tickets with attachments for trac 
+          versions 0.9 and 0.10. Field "id" is not known when a existing
+          ticket is fetched (Error = KeyError: 'id')
+          Fixed By: See tickets #258 and #449 on trac-hacks
 
 2006-06-02

emailtotracscript/trunk/INSTALL

@@ -22 +22 @@
  email_header: 1            # OPTIONAL, if set then show TO/CC fields in description
  trac_version: 0.8          # OPTIONAL, if set use this as trac version (D: 0.9)
+ enable_syslog: 1           # OPTIONAL, if set log errors to syslog
 
  [bas]                     # OPTIONAL project declaration, also set 

emailtotracscript/trunk/debian/changelog

@@ +1 @@
+email2trac (0.7.3-1) stable; urgency=low
+
+  * Enabled syslog option
+
+ -- root <root@subtrac.sara.nl>  Thu, 22 Jun 2006 12:45:37 +0200
+
+email2trac (0.7.2-0) stable; urgency=low
+
+  * Added new try/except statement and fixed LookupError
+
+ -- root <root@subtrac.sara.nl>  Thu, 22 Jun 2006 09:59:02 +0200
+
 email2trac (0.7.1-3) stable; urgency=low
 

emailtotracscript/trunk/email2trac.conf

@@ -11 +11 @@
 email_header: 1
 trac_version: 0.9
+enable_syslog : 0
 alternate_notify_template :
+
 
 [bas]

emailtotracscript/trunk/email2trac.py.in

@@ -54 +54 @@
         spam_level   : 4               # OPTIONAL, if set check for SPAM mail 
         reply_address: 1               # OPTIONAL, if set then fill in ticket CC field
-    umask        : 022             # OPTIONAL, if set then use this umask for creation of the attachments
+        umask        : 022             # OPTIONAL, if set then use this umask for creation of the attachments
         mailto_link  : 1               # OPTIONAL, if set then [mailto:<>] in description 
         mailto_cc    : basv@sara.nl    # OPTIONAL, use this address as CC in mailto line
@@ -187 +187 @@
                                 try:
                                         temp = unicode(text, format)
-                                except UnicodeError:
+                                except (UnicodeError,LookupError):
                                         # This always works 
                                         #
                                         temp = unicode(text, 'iso-8859-15')
+                                        
                                 temp =  temp.encode('utf-8')
                         else:
@@ -495 +496 @@
                                 # UTF-8 encode body_text
                                 #
-                                charset = msg.get_content_charset('iso-8859-15')
+                                charset = part.get_content_charset('iso-8859-15')
                                 ubody_text = unicode(body_text, charset).encode('utf-8')
 
@@ -696 +697 @@
         return project
 
+
 if __name__ == '__main__':
         # Default config file
@@ -702 +704 @@
         project = ''
         component = ''
-        
+        ENABLE_SYSLOG = 0
+                
         try:
                 opts, args = getopt.getopt(sys.argv[1:], 'chf:p:', ['component=','help', 'file=', 'project='])
@@ -709 +712 @@
                 print detail
                 sys.exit(1)
-
+        
         project_name = None
         for opt,value in opts:
@@ -721 +724 @@
                 elif opt in ['-p', '--project']:
                         project_name = value
-
+        
         settings = ReadConfig(configfile, project_name)
         if not settings.has_key('project'):
@@ -727 +730 @@
                 print 'No Trac project is defined in the email2trac config file.'
                 sys.exit(1)
-
+        
         if component:
                 settings['component'] = component
-
+        
         if settings.has_key('trac_version'):
                 version = float(settings['trac_version'])
@@ -736 +739 @@
                 version = trac_default_version
 
+        if settings.has_key('enable_syslog'):
+                ENABLE_SYSLOG =  float(settings['enable_syslog']) 
+                        
         #debug HvB
         #print settings
-
-        if version == 0.8:
-                from trac.Environment import Environment
-                from trac.Ticket import Ticket
-                from trac.Notify import TicketNotifyEmail
-                from trac.Href import Href
-                from trac import util
-                import sqlite
-        elif version == 0.9:
-                from trac import attachment 
-                from trac.env import Environment
-                from trac.ticket import Ticket
-                from trac.web.href import Href
-                from trac import util
-                from trac.Notify import TicketNotifyEmail
-        elif version == 0.10:
-                from trac import attachment 
-                from trac.env import Environment
-                from trac.ticket import Ticket
-                from trac.web.href import Href
-                from trac import util
-                # see http://projects.edgewall.com/trac/changeset/2799
-                from trac.ticket.notification import TicketNotifyEmail
-
-        env = Environment(settings['project'], create=0)
-        tktparser = TicketEmailParser(env, settings, version)
-        tktparser.parse(sys.stdin)
+        
+        try:
+                if version == 0.8:
+                        from trac.Environment import Environment
+                        from trac.Ticket import Ticket
+                        from trac.Notify import TicketNotifyEmail
+                        from trac.Href import Href
+                        from trac import util
+                        import sqlite
+                elif version == 0.9:
+                        from trac import attachment 
+                        from trac.env import Environment
+                        from trac.ticket import Ticket
+                        from trac.web.href import Href
+                        from trac import util
+                        from trac.Notify import TicketNotifyEmail
+                elif version == 0.10:
+                        from trac import attachment 
+                        from trac.env import Environment
+                        from trac.ticket import Ticket
+                        from trac.web.href import Href
+                        from trac import util
+                        # see http://projects.edgewall.com/trac/changeset/2799
+                        from trac.ticket.notification import TicketNotifyEmail
+        
+                env = Environment(settings['project'], create=0)
+                tktparser = TicketEmailParser(env, settings, version)
+                tktparser.parse(sys.stdin)
+
+        # Catch all errors ans log to SYSLOG if we have enabled this
+        # else stdout
+        #
+        except Exception, error:
+                import syslog, traceback
+
+                if ENABLE_SYSLOG:
+                        syslog.openlog('email2trac', syslog.LOG_NOWAIT)
+                        etype, evalue, etb = sys.exc_info()
+                        for e in traceback.format_exception(etype, evalue, etb):
+                                syslog.syslog(e)
+                        syslog.closelog()
+                else:
+                        traceback.print_exc()
 
 # EOB