Skip to content

DupFileManager, FileMonitor, RenameFile: bind the exception in retry handlers #757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
johnkattenhorn wants to merge 1 commit into
base: main
Choose a base branch
from
Open

DupFileManager, FileMonitor, RenameFile: bind the exception in retry handlers #757

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion plugins/DupFileManager/DupFileManager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ def setTagId_withRetry(tagName, sceneDetails, DupFileToKeep, TagReason="", ignor
if errMsg != None:
stash.Warn(errMsg)
return setTagId(tagName, sceneDetails, DupFileToKeep, TagReason, ignoreAutoTag)
except (requests.exceptions.ConnectionError, ConnectionResetError):
except (requests.exceptions.ConnectionError, ConnectionResetError) as e:
tb = traceback.format_exc()
errMsg = f"[setTagId] Exception calling setTagId. Will retry; count({i}); Error: {e}\nTraceBack={tb}"
except Exception as e:
Expand Down
8 changes: 4 additions & 4 deletions plugins/DupFileManager/StashPluginHelper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ def mergeMetadata(self, SrcData, DestData, retryCount = 12, sleepSecondsBetweenR
SrcData = self.find_scene(SrcData)
DestData = self.find_scene(DestData)
return self._mergeMetadata.merge(SrcData, DestData)
except (requests.exceptions.ConnectionError, ConnectionResetError):
except (requests.exceptions.ConnectionError, ConnectionResetError) as e:
tb = traceback.format_exc()
errMsg = f"Exception calling [mergeMetadata]. Will retry; count({i}); Error: {e}\nTraceBack={tb}"
except Exception as e:
Expand Down Expand Up @@ -710,7 +710,7 @@ def addTag(self, scene, tagName, tagName_descp = "", ignoreAutoTag=False, retryC
dataDict.update({'tag_ids' : tagIds})
self.update_scene(dataDict)
return True
except (ConnectionResetError):
except (ConnectionResetError) as e:
tb = traceback.format_exc()
errMsg = f"Exception calling [addTag]. Will retry; count({i}); Error: {e}\nTraceBack={tb}"
except Exception as e:
Expand Down Expand Up @@ -745,7 +745,7 @@ def updateScene(self, update_input, create=False, retryCount = 24, sleepSecondsB
if errMsg != None:
self.Warn(errMsg)
return self.update_scene(update_input, create)
except (ConnectionResetError):
except (ConnectionResetError) as e:
tb = traceback.format_exc()
errMsg = f"Exception calling [updateScene]. Will retry; count({i}); Error: {e}\nTraceBack={tb}"
except Exception as e:
Expand All @@ -766,7 +766,7 @@ def destroyScene(self, scene_id, delete_file=False, retryCount = 12, sleepSecond
self.Warn(f"Scene {scene_id} not found in Stash.")
return False
return self.destroy_scene(scene_id, delete_file)
except (ConnectionResetError):
except (ConnectionResetError) as e:
tb = traceback.format_exc()
errMsg = f"Exception calling [updateScene]. Will retry; count({i}); Error: {e}\nTraceBack={tb}"
except Exception as e:
Expand Down
8 changes: 4 additions & 4 deletions plugins/FileMonitor/StashPluginHelper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ def mergeMetadata(self, SrcData, DestData, retryCount = 12, sleepSecondsBetweenR
SrcData = self.find_scene(SrcData)
DestData = self.find_scene(DestData)
return self._mergeMetadata.merge(SrcData, DestData)
except (requests.exceptions.ConnectionError, ConnectionResetError):
except (requests.exceptions.ConnectionError, ConnectionResetError) as e:
tb = traceback.format_exc()
errMsg = f"Exception calling [mergeMetadata]. Will retry; count({i}); Error: {e}\nTraceBack={tb}"
except Exception as e:
Expand Down Expand Up @@ -710,7 +710,7 @@ def addTag(self, scene, tagName, tagName_descp = "", ignoreAutoTag=False, retryC
dataDict.update({'tag_ids' : tagIds})
self.update_scene(dataDict)
return True
except (ConnectionResetError):
except (ConnectionResetError) as e:
tb = traceback.format_exc()
errMsg = f"Exception calling [addTag]. Will retry; count({i}); Error: {e}\nTraceBack={tb}"
except Exception as e:
Expand Down Expand Up @@ -745,7 +745,7 @@ def updateScene(self, update_input, create=False, retryCount = 24, sleepSecondsB
if errMsg != None:
self.Warn(errMsg)
return self.update_scene(update_input, create)
except (ConnectionResetError):
except (ConnectionResetError) as e:
tb = traceback.format_exc()
errMsg = f"Exception calling [updateScene]. Will retry; count({i}); Error: {e}\nTraceBack={tb}"
except Exception as e:
Expand All @@ -766,7 +766,7 @@ def destroyScene(self, scene_id, delete_file=False, retryCount = 12, sleepSecond
self.Warn(f"Scene {scene_id} not found in Stash.")
return False
return self.destroy_scene(scene_id, delete_file)
except (ConnectionResetError):
except (ConnectionResetError) as e:
tb = traceback.format_exc()
errMsg = f"Exception calling [updateScene]. Will retry; count({i}); Error: {e}\nTraceBack={tb}"
except Exception as e:
Expand Down
8 changes: 4 additions & 4 deletions plugins/RenameFile/StashPluginHelper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,7 +519,7 @@ def mergeMetadata(self, SrcData, DestData, retryCount = 12, sleepSecondsBetweenR
SrcData = self.find_scene(SrcData)
DestData = self.find_scene(DestData)
return self._mergeMetadata.merge(SrcData, DestData)
except (requests.exceptions.ConnectionError, ConnectionResetError):
except (requests.exceptions.ConnectionError, ConnectionResetError) as e:
tb = traceback.format_exc()
errMsg = f"Exception calling [mergeMetadata]. Will retry; count({i}); Error: {e}\nTraceBack={tb}"
except Exception as e:
Expand Down Expand Up @@ -710,7 +710,7 @@ def addTag(self, scene, tagName, tagName_descp = "", ignoreAutoTag=False, retryC
dataDict.update({'tag_ids' : tagIds})
self.update_scene(dataDict)
return True
except (ConnectionResetError):
except (ConnectionResetError) as e:
tb = traceback.format_exc()
errMsg = f"Exception calling [addTag]. Will retry; count({i}); Error: {e}\nTraceBack={tb}"
except Exception as e:
Expand Down Expand Up @@ -745,7 +745,7 @@ def updateScene(self, update_input, create=False, retryCount = 24, sleepSecondsB
if errMsg != None:
self.Warn(errMsg)
return self.update_scene(update_input, create)
except (ConnectionResetError):
except (ConnectionResetError) as e:
tb = traceback.format_exc()
errMsg = f"Exception calling [updateScene]. Will retry; count({i}); Error: {e}\nTraceBack={tb}"
except Exception as e:
Expand All @@ -766,7 +766,7 @@ def destroyScene(self, scene_id, delete_file=False, retryCount = 12, sleepSecond
self.Warn(f"Scene {scene_id} not found in Stash.")
return False
return self.destroy_scene(scene_id, delete_file)
except (ConnectionResetError):
except (ConnectionResetError) as e:
tb = traceback.format_exc()
errMsg = f"Exception calling [updateScene]. Will retry; count({i}); Error: {e}\nTraceBack={tb}"
except Exception as e:
Expand Down