Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita3f6dd3

Browse files
committed
Revert "Skip cleanup of custom directory was provided"
Per perort in [issue#57]: cleanup backward compatibility broken in 1.8.3.If this feature is needed, feel free to bring it back, but maintain compatibility.This reverts commitcdc933f.
1 parent987e327 commita3f6dd3

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

‎testgres/node.py

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -119,12 +119,10 @@ def __init__(self, name=None, port=None, base_dir=None):
119119
# private
120120
self._pg_version=PgVer(get_pg_version())
121121
self._should_free_port=portisNone
122+
self._base_dir=base_dir
122123
self._logger=None
123124
self._master=None
124125

125-
self._custom_base_dir=base_dir
126-
self._base_dir=base_dir
127-
128126
# basic
129127
self.host='127.0.0.1'
130128
self.name=nameorgenerate_app_name()
@@ -817,13 +815,11 @@ def cleanup(self, max_attempts=3):
817815

818816
self._try_shutdown(max_attempts)
819817

820-
# only remove if base directory was temporary
821-
ifnotself._custom_base_dir:
822-
# choose directory to be removed
823-
iftestgres_config.node_cleanup_full:
824-
rm_dir=self.base_dir# everything
825-
else:
826-
rm_dir=self.data_dir# just data, save logs
818+
# choose directory to be removed
819+
iftestgres_config.node_cleanup_full:
820+
rm_dir=self.base_dir# everything
821+
else:
822+
rm_dir=self.data_dir# just data, save logs
827823

828824
rmtree(rm_dir,ignore_errors=True)
829825

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp