oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update ContentDbPlugin.py

Browse source
This commit is contained in:
cclauss 2017-07-16 22:46:13 +02:00 committed by GitHub
parent d426b6bb02
commit 08219a0285
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugins/OptionalManager/ContentDbPlugin.py
View file

@ -132,7 +132,7 @@ class ContentDbPlugin(object):
content = site.content_manager.contents[row["inner_path"]] content = site.content_manager.contents[row["inner_path"]]
try: try:
num += self.setContentFilesOptional(site, row["inner_path"], content, cur=cur) num += self.setContentFilesOptional(site, row["inner_path"], content, cur=cur)
except Exception, err: except Exception as err:
self.log.error("Error loading %s into file_optional: %s" % (row["inner_path"], err)) self.log.error("Error loading %s into file_optional: %s" % (row["inner_path"], err))
cur.execute("COMMIT") cur.execute("COMMIT")
cur.close() cur.close()
@ -159,7 +159,7 @@ class ContentDbPlugin(object):
cur = self cur = self
try: try:
cur.execute("BEGIN") cur.execute("BEGIN")
except Exception, err: except Exception as err:
self.log.warning("Transaction begin error %s %s: %s" % (site, content_inner_path, Debug.formatException(err))) self.log.warning("Transaction begin error %s %s: %s" % (site, content_inner_path, Debug.formatException(err)))
num = 0 num = 0
@ -195,7 +195,7 @@ class ContentDbPlugin(object):
if cur == self: if cur == self:
try: try:
cur.execute("END") cur.execute("END")
except Exception, err: except Exception as err:
self.log.warning("Transaction end error %s %s: %s" % (site, content_inner_path, Debug.formatException(err))) self.log.warning("Transaction end error %s %s: %s" % (site, content_inner_path, Debug.formatException(err)))
return num return num
@ -387,7 +387,7 @@ class ContentDbPlugin(object):
site.content_manager.optionalRemove(row["inner_path"], row["hash_id"], row["size"]) site.content_manager.optionalRemove(row["inner_path"], row["hash_id"], row["size"])
site.storage.delete(row["inner_path"]) site.storage.delete(row["inner_path"])
need_delete -= row["size"] need_delete -= row["size"]
except Exception, err: except Exception as err:
site.log.error("Error deleting %s: %s" % (row["inner_path"], err)) site.log.error("Error deleting %s: %s" % (row["inner_path"], err))
if need_delete <= 0: if need_delete <= 0: