py-pve-cloud-backup 3.5.8__tar.gz → 3.5.9__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (25) hide show
  1. {py_pve_cloud_backup-3.5.8/src/py_pve_cloud_backup.egg-info → py_pve_cloud_backup-3.5.9}/PKG-INFO +1 -1
  2. py_pve_cloud_backup-3.5.9/src/pve_cloud_backup/_version.py +1 -0
  3. {py_pve_cloud_backup-3.5.8 → py_pve_cloud_backup-3.5.9}/src/pve_cloud_backup/daemon/bdd.py +12 -4
  4. {py_pve_cloud_backup-3.5.8 → py_pve_cloud_backup-3.5.9/src/py_pve_cloud_backup.egg-info}/PKG-INFO +1 -1
  5. py_pve_cloud_backup-3.5.8/src/pve_cloud_backup/_version.py +0 -1
  6. {py_pve_cloud_backup-3.5.8 → py_pve_cloud_backup-3.5.9}/LICENSE.md +0 -0
  7. {py_pve_cloud_backup-3.5.8 → py_pve_cloud_backup-3.5.9}/README.md +0 -0
  8. {py_pve_cloud_backup-3.5.8 → py_pve_cloud_backup-3.5.9}/pyproject.toml +0 -0
  9. {py_pve_cloud_backup-3.5.8 → py_pve_cloud_backup-3.5.9}/requirements.txt +0 -0
  10. {py_pve_cloud_backup-3.5.8 → py_pve_cloud_backup-3.5.9}/setup.cfg +0 -0
  11. {py_pve_cloud_backup-3.5.8 → py_pve_cloud_backup-3.5.9}/src/pve_cloud_backup/daemon/brctl.py +0 -0
  12. {py_pve_cloud_backup-3.5.8 → py_pve_cloud_backup-3.5.9}/src/pve_cloud_backup/daemon/funcs.py +0 -0
  13. {py_pve_cloud_backup-3.5.8 → py_pve_cloud_backup-3.5.9}/src/pve_cloud_backup/daemon/restore.py +0 -0
  14. {py_pve_cloud_backup-3.5.8 → py_pve_cloud_backup-3.5.9}/src/pve_cloud_backup/fetcher/ext_zfs.py +0 -0
  15. {py_pve_cloud_backup-3.5.8 → py_pve_cloud_backup-3.5.9}/src/pve_cloud_backup/fetcher/funcs.py +0 -0
  16. {py_pve_cloud_backup-3.5.8 → py_pve_cloud_backup-3.5.9}/src/pve_cloud_backup/fetcher/git.py +0 -0
  17. {py_pve_cloud_backup-3.5.8 → py_pve_cloud_backup-3.5.9}/src/pve_cloud_backup/fetcher/main.py +0 -0
  18. {py_pve_cloud_backup-3.5.8 → py_pve_cloud_backup-3.5.9}/src/pve_cloud_backup/fetcher/net.py +0 -0
  19. {py_pve_cloud_backup-3.5.8 → py_pve_cloud_backup-3.5.9}/src/pve_cloud_backup/fetcher/nextcloud.py +0 -0
  20. {py_pve_cloud_backup-3.5.8 → py_pve_cloud_backup-3.5.9}/src/pve_cloud_backup/fetcher/patroni.py +0 -0
  21. {py_pve_cloud_backup-3.5.8 → py_pve_cloud_backup-3.5.9}/src/py_pve_cloud_backup.egg-info/SOURCES.txt +0 -0
  22. {py_pve_cloud_backup-3.5.8 → py_pve_cloud_backup-3.5.9}/src/py_pve_cloud_backup.egg-info/dependency_links.txt +0 -0
  23. {py_pve_cloud_backup-3.5.8 → py_pve_cloud_backup-3.5.9}/src/py_pve_cloud_backup.egg-info/entry_points.txt +0 -0
  24. {py_pve_cloud_backup-3.5.8 → py_pve_cloud_backup-3.5.9}/src/py_pve_cloud_backup.egg-info/requires.txt +0 -0
  25. {py_pve_cloud_backup-3.5.8 → py_pve_cloud_backup-3.5.9}/src/py_pve_cloud_backup.egg-info/top_level.txt +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: py-pve-cloud-backup
3
- Version: 3.5.8
3
+ Version: 3.5.9
4
4
  Author-email: Tobias Huebner <tobias.huebner@vmzberlin.com>
5
5
  License-Expression: GPL-3.0-or-later
6
6
  License-File: LICENSE.md
@@ -0,0 +1 @@
1
+ __version__ = "3.5.9"
@@ -135,7 +135,7 @@ async def handle_client(reader: asyncio.StreamReader, writer: asyncio.StreamWrit
135
135
  exit_code = await borg_proc.wait()
136
136
 
137
137
  if exit_code != 0:
138
- raise Exception(f"Borg failed with code {exit_code}")
138
+ raise RuntimeError(f"Borg failed with code {exit_code}")
139
139
 
140
140
  except (
141
141
  asyncio.IncompleteReadError,
@@ -143,14 +143,22 @@ async def handle_client(reader: asyncio.StreamReader, writer: asyncio.StreamWrit
143
143
  BrokenPipeError,
144
144
  ) as e:
145
145
  logger.warning(
146
- "Client error on transmission: %s, killing borg...",
146
+ "Client error on transmission: %s, gracefully terminating borg...",
147
147
  e,
148
148
  exc_info=True,
149
149
  )
150
150
 
151
151
  if borg_proc:
152
- borg_proc.kill()
153
- await borg_proc.wait()
152
+ borg_proc.terminate()
153
+
154
+ try:
155
+ await asyncio.wait_for(borg_proc.wait(), timeout=30)
156
+ except asyncio.TimeoutError:
157
+ logger.warning(
158
+ "terminate timed out, force killing borg subprocess!"
159
+ )
160
+ borg_proc.kill()
161
+ await borg_proc.wait()
154
162
 
155
163
  # cleanup repo
156
164
  await asyncio.create_subprocess_exec(
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: py-pve-cloud-backup
3
- Version: 3.5.8
3
+ Version: 3.5.9
4
4
  Author-email: Tobias Huebner <tobias.huebner@vmzberlin.com>
5
5
  License-Expression: GPL-3.0-or-later
6
6
  License-File: LICENSE.md
@@ -1 +0,0 @@
1
- __version__ = "3.5.8"