Skip to content

Commit 91edf56

Browse files
committed
Use the vault's logger in pull_vault
1 parent c1bf28d commit 91edf56

1 file changed

Lines changed: 6 additions & 6 deletions

File tree

syncrypt/app/syncrypt.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -741,7 +741,7 @@ def pull_vault_periodically(self, vault):
741741

742742
@asyncio.coroutine
743743
def pull_vault(self, vault, full=False):
744-
logger.info('Pulling %s', vault)
744+
vault.logger.info('Pulling %s', vault)
745745
latest_revision = None
746746
total = 0
747747
successful = []
@@ -768,22 +768,22 @@ def cb(_task):
768768
bundle = yield from vault.add_bundle_by_metadata(store_hash, metadata)
769769
task = yield from self.pull_bundle(bundle)
770770
task.add_done_callback(cb)
771-
except ValueError as e:
772-
logger.exception(e)
771+
except Exception as e:
772+
vault.logger.exception(e)
773773
latest_revision = server_info.get('id') or latest_revision
774774
yield from self.wait()
775775

776776
success = len(successful) == total
777777

778778
if success:
779779
if total == 0:
780-
logger.info('No changes in %s', vault)
780+
vault.logger.info('No changes in %s', vault)
781781
else:
782-
logger.info('Successfully pulled %d revisions for %s', total, vault)
782+
vault.logger.info('Successfully pulled %d revisions for %s', total, vault)
783783
if latest_revision:
784784
vault.update_revision(latest_revision)
785785
else:
786-
logger.error('%s failure(s) occured while pulling %d revisions for %s',
786+
vault.logger.error('%s failure(s) occured while pulling %d revisions for %s',
787787
total - len(successful), total, vault)
788788

789789
@asyncio.coroutine

0 commit comments

Comments
 (0)