← Back to branch summary

~david-goetz/swift/zero_handoff

« back to all changes in this revision

Viewing changes to swift/common/db_replicator.py

  • Committer: Tarmac
  • Author(s): David Goetz
  • Date: 2011-01-26 23:56:47 UTC
  • mfrom: (176.1.2 bare_except)
  • Revision ID: tarmac-20110126235647-rvhywh8z0vh2qm4j
Removing bare excepts from code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
swift/common/db_replicator.py
21
21
import time
22
22
import shutil
23
23
 
24
 
from eventlet import GreenPool, sleep, Timeout
 
24
from eventlet import GreenPool, sleep, Timeout, TimeoutError
25
25
from eventlet.green import subprocess
26
26
import simplejson
27
27
from webob import Response
79
79
            response = self.getresponse()
80
80
            response.data = response.read()
81
81
            return response
82
 
        except:
 
82
        except Exception:
83
83
            self.logger.exception(
84
84
                _('ERROR reading HTTP response from %s'), self.node)
85
85
            return None
359
359
            except DriveNotMounted:
360
360
                repl_nodes.append(more_nodes.next())
361
361
                self.logger.error(_('ERROR Remote drive not mounted %s'), node)
362
 
            except:
 
362
            except (Exception, TimeoutError):
363
363
                self.logger.exception(_('ERROR syncing %(file)s with node'
364
364
                        ' %(node)s'), {'file': object_file, 'node': node})
365
365
            self.stats['success' if success else 'failure'] += 1
432
432
        while True:
433
433
            try:
434
434
                self.run_once()
435
 
            except:
 
435
            except (Exception, TimeoutError):
436
436
                self.logger.exception(_('ERROR trying to replicate'))
437
437
            sleep(self.run_pause)
438
438