From a785d40e347b043f023c18cec97bf27a2de159cf Mon Sep 17 00:00:00 2001 From: Lutz Bender Date: Mon, 11 Aug 2025 11:30:26 +0200 Subject: [PATCH 1/2] nextcloud: increase timeout --- packages/modules/backup_clouds/nextcloud/backup_cloud.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/modules/backup_clouds/nextcloud/backup_cloud.py b/packages/modules/backup_clouds/nextcloud/backup_cloud.py index cee8d87290..c059190f2f 100644 --- a/packages/modules/backup_clouds/nextcloud/backup_cloud.py +++ b/packages/modules/backup_clouds/nextcloud/backup_cloud.py @@ -26,7 +26,7 @@ def upload_backup(config: NextcloudBackupCloudConfiguration, backup_filename: st headers={'X-Requested-With': 'XMLHttpRequest', }, data=backup_file, auth=(user, '' if config.password is None else config.password), - timeout=30 + timeout=60 ) From a1b96a45b5f65c718b50d8b5ac6a2cc139b73c6b Mon Sep 17 00:00:00 2001 From: Lutz Bender Date: Mon, 11 Aug 2025 11:30:50 +0200 Subject: [PATCH 2/2] samba: fix deprecated call of log.warn --- packages/modules/backup_clouds/samba/backup_cloud.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/modules/backup_clouds/samba/backup_cloud.py b/packages/modules/backup_clouds/samba/backup_cloud.py index 044f1c3fbd..398c5d01f6 100644 --- a/packages/modules/backup_clouds/samba/backup_cloud.py +++ b/packages/modules/backup_clouds/samba/backup_cloud.py @@ -34,8 +34,8 @@ def upload_backup(config: SambaBackupCloudConfiguration, backup_filename: str, b host_is_reachable = is_port_open(config.smb_server, 139) if found_invalid_chars: - log.warn("Folgenden ungültige Zeichen im Pfad gefunden: {}".format(found_invalid_chars.group())) - log.warn("Sicherung nicht erfolgreich.") + log.warning("Folgenden ungültige Zeichen im Pfad gefunden: {}".format(found_invalid_chars.group())) + log.warning("Sicherung nicht erfolgreich.") send_file = False else: send_file = True @@ -51,9 +51,9 @@ def upload_backup(config: SambaBackupCloudConfiguration, backup_filename: str, b log.error("Möglicherweise ist die Freigabe oder ein Unterordner nicht vorhanden.") conn.close() elif send_file: - log.warn("SMB Verbindungsaufbau fehlgeschlagen.") + log.warning("SMB Verbindungsaufbau fehlgeschlagen.") elif not host_is_reachable: - log.warn("Host {} und/oder Port 139 nicht zu erreichen.".format(config.smb_server)) + log.warning("Host {} und/oder Port 139 nicht zu erreichen.".format(config.smb_server)) def create_backup_cloud(config: SambaBackupCloud):