Changes related to logs and error handling.

git-archimport-id: frederic@jolliton.com--2004-private/mail-filter--main--0.1--patch-3

diff --git a/mail.filter b/mail.filter
index 5961dfa..5a45842 100755 (executable)
--- a/mail.filter
+++ b/mail.filter
@@ -263,7 +263,8 @@ def logMessage( msg ) :
                try :
                        logMessage.logFile = open( g_pathLog , 'a+' )
                except :
-                       return
+                       if not g_copyLogToStdout :
+                               return
 
        msg = msg.splitlines()
        prefix = timestamp() + ' [%s] ' % os.getpid()
@@ -324,7 +325,7 @@ def backup( filenamePrefix = None ) :
                f.write( g_mailText )
                f.close()
        except :
-               logMessage( 'Error saving backup copy.' )
+               logMessage( 'PANIC: Unable to write backup to %s.' % fn )
        else :
                logMessage( 'Message appended to backup directory as `%s\'.' % basename )
 
@@ -543,8 +544,10 @@ def readUserRules( user ) :
        #
        try :
                return confparser.readConfiguration( filename )
+       except OSError , e :
+               pass
        except Exception , e :
-               print e
+               logMessage( 'Error in file %r. See option -c to check this file.' % ( filename , ) )
 
 #-----------------------------------------------------------------------------