ttygroup
/
gertty
Code Issues Proposed changes

Warn, log, and continue on conflict query failure 

If Gerrit returns an error with the conflict query when syncing
a change, warn the user and log, but do not fail.

Change-Id: I75302e3b9b485cb2c1b52b6dda0f68fb0a6fe450
This commit is contained in:
James E. Blair 2016-11-28 11:14:55 -08:00
parent fcf512ba85
commit 7016d319e7
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gertty/sync.py
View File

@ -23,6 +23,7 @@ import threading
import json
import time
import datetime
import warnings
import dateutil.parser
try:
@ -588,8 +589,14 @@ class SyncChangeTask(Task):
for remote_commit, remote_revision in remote_change.get('revisions', {}).items():
remote_comments_data = sync.get('changes/%s/revisions/%s/comments' % (self.change_id, remote_commit))
remote_revision['_gertty_remote_comments_data'] = remote_comments_data
remote_conflicts = sync.query(['q=status:open+is:mergeable+conflicts:%s' %
remote_change['_number']])
try:
remote_conflicts = sync.query(['q=status:open+is:mergeable+conflicts:%s' %
remote_change['_number']])
except Exception:
self.log.exception("Unable to sync conflicts for change %s" % self.change_id)
warnings.warn("Unable to sync conflicts for change %s" % self.change_id)
remote_conflicts = []
fetches = collections.defaultdict(list)
parent_commits = set()
with app.db.getSession() as session: