openstack/swift
Code Issues Proposed changes

oops

Browse Source
This commit is contained in:
Chuck Thier
2010-09-01 15:56:37 +00:00
parent 158e6c3ae9
commit 4a7abe71d9
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
etc/proxy-server.conf-sample
View File

@@ -8,9 +8,9 @@
# key_file = /etc/swift/proxy.key # key_file = /etc/swift/proxy.key
[pipeline:main] [pipeline:main]
pipeline = healthcheck cache auth proxy pipeline = healthcheck cache auth proxy-server
[app:proxy] [app:proxy-server]
use = egg:swift#proxy use = egg:swift#proxy
# log_name = proxy-server # log_name = proxy-server
# log_facility = LOG_LOCAL0 # log_facility = LOG_LOCAL0

4
swift/account/reaper.py
View File

@@ -107,7 +107,7 @@ class AccountReaper(Daemon):
sleep(random.random() * self.interval) sleep(random.random() * self.interval)
while True: while True:
begin = time() begin = time()
self.reap_once() self.run_once()
elapsed = time() - begin elapsed = time() - begin
if elapsed < self.interval: if elapsed < self.interval:
sleep(self.interval - elapsed) sleep(self.interval - elapsed)
@@ -116,7 +116,7 @@ class AccountReaper(Daemon):
""" """
Main entry point when running the reaper in 'once' mode, where it will Main entry point when running the reaper in 'once' mode, where it will
do a single pass over all accounts on the server. This is called do a single pass over all accounts on the server. This is called
repeatedly by :func:`reap_forever`. This will call :func:`reap_device` repeatedly by :func:`run_forever`. This will call :func:`reap_device`
once for each device on the server. once for each device on the server.
""" """
self.logger.debug('Begin devices pass: %s' % self.devices) self.logger.debug('Begin devices pass: %s' % self.devices)

2
swift/common/db_replicator.py
View File

@@ -432,7 +432,7 @@ class Replicator(Daemon):
""" """
while True: while True:
try: try:
self.replicate_once() self.run_once()
except: except:
self.logger.exception('ERROR trying to replicate') self.logger.exception('ERROR trying to replicate')
sleep(self.run_pause) sleep(self.run_pause)