← Back to branch summary

~ubuntu-branches/ubuntu/trusty/swift/trusty-updates

« back to all changes in this revision

Viewing changes to swift/obj/replicator.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, James Page, Chuck Short
  • Date: 2013-08-13 10:37:13 UTC
  • mfrom: (1.2.21)
  • Revision ID: package-import@ubuntu.com-20130813103713-1ctbx4zifyljs2aq
Tags: 1.9.1-0ubuntu1
[ James Page ]
* d/control: Update VCS fields for new branch locations.

[ Chuck Short ]
* New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
swift/obj/replicator.py
20
20
import time
21
21
import itertools
22
22
import cPickle as pickle
 
23
from gettext import gettext as _
23
24
 
24
25
import eventlet
25
26
from eventlet import GreenPool, tpool, Timeout, sleep, hubs
34
35
from swift.common.bufferedhttp import http_connect
35
36
from swift.common.daemon import Daemon
36
37
from swift.common.http import HTTP_OK, HTTP_INSUFFICIENT_STORAGE
37
 
from swift.obj.base import get_hashes
 
38
from swift.obj.diskfile import get_hashes
38
39
 
39
40
 
40
41
hubs.use_hub(get_hub())
111
112
            else:
112
113
                self.logger.error(result)
113
114
        if ret_val:
114
 
            self.logger.error(_('Bad rsync return code: %(args)s -> %(ret)d'),
 
115
            self.logger.error(_('Bad rsync return code: %(ret)d <- %(args)s'),
115
116
                              {'args': str(args), 'ret': ret_val})
116
117
        elif results:
117
118
            self.logger.info(