From 18e54c4be95f69e5ac51c22e348119aab3b2375f Mon Sep 17 00:00:00 2001 From: Tobias Leuschner Date: Sat, 9 May 2026 13:24:48 +0200 Subject: [PATCH] =?UTF-8?q?feat:=20Fehlerbehandlung=20f=C3=BCr=20rclone-Be?= =?UTF-8?q?fehle=20verbessert=20und=20Versionsnummer=20auf=201.0.38=20erh?= =?UTF-8?q?=C3=B6ht?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app.py | 15 +++++++++------ version.txt | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app.py b/app.py index a86bf4a..7aabbe8 100644 --- a/app.py +++ b/app.py @@ -877,11 +877,10 @@ def _rclone(*args, timeout=60): ['rclone', '--config', str(RCLONE_CONF)] + list(args), capture_output=True, text=True, timeout=timeout ) - except subprocess.TimeoutExpired as e: - if e.process: - e.process.kill() - # Fake CompletedProcess mit Fehlercode - return subprocess.CompletedProcess(args, 1, stdout='', stderr='Timeout') + except subprocess.TimeoutExpired: + return subprocess.CompletedProcess(args, 1, stdout='', stderr=f'Timeout nach {timeout}s') + except Exception as e: + return subprocess.CompletedProcess(args, 1, stdout='', stderr=str(e)) def _rclone_obscure(pw): @@ -1242,7 +1241,11 @@ def r_upload_toggle(tid): @app.route('/api/upload/targets//test', methods=['POST']) def r_upload_test(tid): - ok, err = test_remote(tid) + try: + ok, err = test_remote(tid) + except Exception as e: + log.exception('upload test failed') + ok, err = False, str(e) return jsonify(ok=ok, error=err) diff --git a/version.txt b/version.txt index 314a62a..9cc0a9d 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -1.0.37 \ No newline at end of file +1.0.38 \ No newline at end of file