r00t2/repomirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

more logging to try to find cause of refusal to sync.

Browse Source
This commit is contained in:
brent s. 2020-06-24 01:25:18 -04:00
parent 2ff334f220
commit ac431a873e
Signed by: bts
GPG Key ID: 8C004C2F93481F6B
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
repomirror/sync.py
View File

@ -232,26 +232,32 @@ class Distro(object):
_logger.debug('Updated local timestamps: {0}'.format(self.timestamps)) _logger.debug('Updated local timestamps: {0}'.format(self.timestamps))
local_checks = sorted([i for i in self.timestamps.values() if i]) local_checks = sorted([i for i in self.timestamps.values() if i])
if local_checks: if local_checks:
_logger.debug('Local timestamps: {0}'.format(', '.join([str(t) for t in local_checks]))) _logger.info('Local timestamps: {0}'.format(', '.join([str(t) for t in local_checks])))
for u in self.upstreams: for u in self.upstreams:
if not u.available: if not u.available:
continue continue
u.fetcher.check() u.fetcher.check()
remote_checks = sorted([i for i in u.fetcher.timestamps.values() if i]) remote_checks = sorted([i for i in u.fetcher.timestamps.values() if i])
if remote_checks: if remote_checks:
_logger.debug('Remote timestamps for {0}: {1}'.format(u.domain, ', '.join([str(t) _logger.info('Remote timestamps for {0}: {1}'.format(u.domain, ', '.join([str(t)
for t in remote_checks]))) for t in remote_checks])))
if not any((local_checks, remote_checks)) or not remote_checks: if not any((local_checks, remote_checks)) or not remote_checks:
_logger.info('There are no reliable timestamp comparisons; syncing.')
u.has_new = True u.has_new = True
else: else:
update = u.fetcher.timestamps.get('update') update = u.fetcher.timestamps.get('update')
sync = u.fetcher.timestamps.get('sync') sync = u.fetcher.timestamps.get('sync')
if update: if update:
if local_checks and (local_checks[-1] < update): if local_checks and (local_checks[-1] < update):
_logger.info('Newest local timestamp is older than the remote update; syncing.')
u.has_new = True u.has_new = True
elif not local_checks: elif not local_checks:
_logger.info('No local timestamps; syncing.')
u.has_new = True u.has_new = True
else: else:
_logger.info('Local checks are newer than upstream.')
else:
_logger.info('No remote update timestamp; syncing.')
u.has_new = True u.has_new = True
if sync: if sync:
td = datetime.datetime.utcnow() - sync td = datetime.datetime.utcnow() - sync
@ -302,12 +308,17 @@ class Distro(object):
fh.write('{0}\n'.format(str(my_pid))) fh.write('{0}\n'.format(str(my_pid)))
for u in self.upstreams: for u in self.upstreams:
if not u.available: if not u.available:
_logger.debug('Upstream {0} is not available; skipping.'.format(u.domain))
continue continue
if u.has_new: if u.has_new:
_logger.info('Initiating syncing upstream {0}.'.format(u.domain))
u.sync() u.sync()
_logger.debug('Sync for upstream {0} complete.'.format(u.domain))
if self.filechecks['local']['sync']: if self.filechecks['local']['sync']:
self.filechecks['local']['sync'].write() self.filechecks['local']['sync'].write()
break break
else:
_logger.debug('Upstream {0} is not new; not syncing.'.format(u.domain))
if self.filechecks['local']['check']: if self.filechecks['local']['check']:
self.filechecks['local']['check'].write() self.filechecks['local']['check'].write()
os.remove(self.lockfile) os.remove(self.lockfile)