Changeset 8617 for branches/gajim_0.11.1/src/common

Timestamp:

08/30/07 01:27:32 (15 months ago)

Author:

roidelapluie

Message:

catch disk full errors. fixes #2937

Location:

branches/gajim_0.11.1/src/common

Files:

• connection_handlers.py (modified) (8 diffs)
• connection.py (modified) (2 diffs)
• exceptions.py (modified) (1 diff)
• logger.py (modified) (1 diff)

branches/gajim_0.11.1/src/common/connection_handlers.py

@@ -35 +35 @@
 from common import gajim
 from common import atom
+from common import exceptions
 from common.commands import ConnectionCommands
 from common.pubsub import ConnectionPubSub
@@ -870 +871 @@
                 else:
                         path_to_file = path
-                fil = open(path_to_file, 'w')
-                fil.write(str(card))
-                fil.close()
+                try:
+                        fil = open(path_to_file, 'w')
+                        fil.write(str(card))
+                        fil.close()
+                except IOError, e:
+                        self.dispatch('ERROR', (_('Disk Write Error'), str(e)))
         
         def get_cached_vcard(self, fjid, is_fake_jid = False):
@@ -1456 +1460 @@
                                 msgtxt = None
                         if self.name not in no_log_for:
-                                gajim.logger.write('error', frm, error_msg, tim = tim,
-                                        subject = subject)
+                                try:
+                                        gajim.logger.write('error', frm, error_msg, tim = tim,
+                                                subject = subject)
+                                except exceptions.PysqliteOperationalError, e:
+                                        self.dispatch('ERROR', (_('Disk Write Error'), str(e)))
                         self.dispatch('MSGERROR', (frm, msg.getErrorCode(), error_msg, msgtxt,
                                 tim))
@@ -1476 +1483 @@
                                 if self.name not in no_log_for and not int(float(time.mktime(tim)))\
                                 <= self.last_history_line[jid] and msgtxt:
-                                        gajim.logger.write('gc_msg', frm, msgtxt, tim = tim)
+                                        try:
+                                                gajim.logger.write('gc_msg', frm, msgtxt, tim = tim)
+                                        except exceptions.PysqliteOperationalError, e:
+                                                self.dispatch('ERROR', (_('Disk Write Error'), str(e)))
                         return
                 elif mtype == 'chat': # it's type 'chat'
@@ -1483 +1493 @@
                         if msg.getTag('body') and self.name not in no_log_for and jid not in\
                                 no_log_for and msgtxt:
-                                msg_id = gajim.logger.write('chat_msg_recv', frm, msgtxt, tim = tim,
-                                        subject = subject)
+                                try:
+                                        msg_id = gajim.logger.write('chat_msg_recv', frm, msgtxt,
+                                                tim = tim, subject = subject)
+                                except exceptions.PysqliteOperationalError, e:
+                                        self.dispatch('ERROR', (_('Disk Write Error'), str(e)))
                 else: # it's single message
                         if invite is not None:
@@ -1495 +1508 @@
                                 return
                         if self.name not in no_log_for and jid not in no_log_for and msgtxt:
-                                gajim.logger.write('single_msg_recv', frm, msgtxt, tim = tim,
-                                        subject = subject)
+                                try:
+                                        gajim.logger.write('single_msg_recv', frm, msgtxt, tim = tim,
+                                                subject = subject)
+                                except exceptions.PysqliteOperationalError, e:
+                                        self.dispatch('ERROR', (_('Disk Write Error'), str(e)))
                         mtype = 'normal'
                 treat_as = gajim.config.get('treat_incoming_messages')
@@ -1648 +1664 @@
                                                 # we know real jid, save it in db
                                                 st += ' (%s)' % jid
-                                        gajim.logger.write('gcstatus', who, st, show)
+                                        try:
+                                                gajim.logger.write('gcstatus', who, st, show)
+                                        except exceptions.PysqliteOperationalError, e:
+                                                self.dispatch('ERROR', (_('Disk Write Error'), str(e)))
                                 if avatar_sha or avatar_sha == '':
                                         if avatar_sha == '':
@@ -1756 +1775 @@
                                 self.request_vcard(jid_stripped)
                 if not ptype or ptype == 'unavailable':
-                        if gajim.config.get('log_contact_status_changes') and self.name\
-                                not in no_log_for and jid_stripped not in no_log_for:
-                                gajim.logger.write('status', jid_stripped, status, show)
+                        if gajim.config.get('log_contact_status_changes') and self.name \
+                        not in no_log_for and jid_stripped not in no_log_for:
+                                try:
+                                        gajim.logger.write('status', jid_stripped, status, show)
+                                except exceptions.PysqliteOperationalError, e:
+                                        self.dispatch('ERROR', (_('Disk Write Error'), str(e)))
                         self.dispatch('NOTIFY', (jid_stripped, show, status, resource, prio,
                                 keyID, timestamp))

branches/gajim_0.11.1/src/common/connection.py

@@ -37 +37 @@
 from common import GnuPG
 from common import passwords
+from common import exceptions
 
 from connection_handlers import *
@@ -782 +783 @@
                                 else:
                                         kind = 'single_msg_sent'
-                                gajim.logger.write(kind, jid, log_msg)
+                                try:
+                                        gajim.logger.write(kind, jid, log_msg)
+                                except exceptions.PysqliteOperationalError, e:
+                                        self.dispatch('ERROR', (_('Disk Write Error'), str(e)))
                 self.dispatch('MSGSENT', (jid, msg, keyID))
         

branches/gajim_0.11.1/src/common/exceptions.py

@@ -21 +21 @@
         def __str__(self):
                 return _('pysqlite2 (aka python-pysqlite2) dependency is missing. Exiting...')
+
+class PysqliteOperationalError(Exception):
+        '''sqlite2 raised pysqlite2.dbapi2.OperationalError'''
+        def __init__(self, text=''):
+                Exception.__init__(self)
+                self.text = text
+
+        def __str__(self):
+                return self.text
 
 class ServiceNotAvailable(Exception):

branches/gajim_0.11.1/src/common/logger.py

@@ -294 +294 @@
                 #print 'saving', values
                 sql = 'INSERT INTO logs (jid_id, contact_name, time, kind, show, message, subject) VALUES (?, ?, ?, ?, ?, ?, ?)'
-                self.cur.execute(sql, values)
+                try:
+                        self.cur.execute(sql, values)
+                except sqlite.OperationalError, e:
+                        raise exceptions.PysqliteOperationalError(str(e))
                 message_id = None
                 try: