From bfcfaf8587c26b26809424c6c7cca8324f50566b Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Mon, 22 Nov 2021 11:41:35 +0100 Subject: [PATCH 1/2] OP-2401 - added another exception --- openpype/modules/default_modules/sync_server/providers/sftp.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/openpype/modules/default_modules/sync_server/providers/sftp.py b/openpype/modules/default_modules/sync_server/providers/sftp.py index 3390cd5d3d..1585b326bd 100644 --- a/openpype/modules/default_modules/sync_server/providers/sftp.py +++ b/openpype/modules/default_modules/sync_server/providers/sftp.py @@ -421,7 +421,8 @@ class SFTPHandler(AbstractProvider): try: return pysftp.Connection(**conn_params) - except paramiko.ssh_exception.SSHException: + except (paramiko.ssh_exception.SSHException, + pysftp.exceptions.ConnectionException): log.warning("Couldn't connect", exc_info=True) def _mark_progress(self, collection, file, representation, server, site, From 80b34a742a314485f5f358bb605770b3a74ba392 Mon Sep 17 00:00:00 2001 From: Petr Kalis Date: Mon, 22 Nov 2021 11:42:32 +0100 Subject: [PATCH 2/2] OP-2401 - fixed resetting sites in a sequence --- .../default_modules/sync_server/sync_server_module.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/openpype/modules/default_modules/sync_server/sync_server_module.py b/openpype/modules/default_modules/sync_server/sync_server_module.py index cd29d93384..500203f3fc 100644 --- a/openpype/modules/default_modules/sync_server/sync_server_module.py +++ b/openpype/modules/default_modules/sync_server/sync_server_module.py @@ -1574,6 +1574,7 @@ class SyncServerModule(OpenPypeModule, ITrayModule): Use 'force' to remove existing or raises ValueError """ + reseted_existing = False for repre_file in representation.pop().get("files"): if file_id and file_id != repre_file["_id"]: continue @@ -1584,12 +1585,15 @@ class SyncServerModule(OpenPypeModule, ITrayModule): self._reset_site_for_file(collection, query, elem, repre_file["_id"], site_name) - return + reseted_existing = True else: msg = "Site {} already present".format(site_name) log.info(msg) raise ValueError(msg) + if reseted_existing: + return + if not file_id: update = { "$push": {"files.$[].sites": elem}