ouczbs/anki-sync-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Log sanity check errors

Browse Source
This commit is contained in:
Karsten Lehmann 2020-08-28 00:03:11 +02:00
parent 93d37d6ab6
commit e18e86e809
No known key found for this signature in database
GPG Key ID: 6C34E8199743C270
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/ankisyncd/sync_app.py
View File

@ -132,14 +132,18 @@ class SyncCollectionHandler(Syncer):
self.mergeChanges(lchg, self.rchg) self.mergeChanges(lchg, self.rchg)
return lchg return lchg
def sanityCheck2(self, client): def sanityCheck2(self, client, full=None):
server = self.sanityCheck() server = self.sanityCheck()
if client != server: if client != server:
logger.info(
f"sanity check failed with server: {server} client: {client}"
)
return dict(status="bad", c=client, s=server) return dict(status="bad", c=client, s=server)
return dict(status="ok") return dict(status="ok")
def finish(self, mod=None): def finish(self, mod=None):
return super().finish(self, anki.utils.intTime(1000)) return super().finish(anki.utils.intTime(1000))
# This function had to be put here in its entirety because Syncer.removed() # This function had to be put here in its entirety because Syncer.removed()
# doesn't use self.usnLim() (which we override in this class) in queries. # doesn't use self.usnLim() (which we override in this class) in queries.
@ -295,7 +299,6 @@ class SyncMediaHandler:
for filename in filenames: for filename in filenames:
try: try:
self.col.media.syncDelete(filename) self.col.media.syncDelete(filename)
self.col.media.db.commit()
except OSError as err: except OSError as err:
logger.error("Error when removing file '%s' from media dir: " logger.error("Error when removing file '%s' from media dir: "
"%s" % (filename, str(err))) "%s" % (filename, str(err)))