Skip to content

Commit 2250e13

Browse files
committed
remove PROMETHEUS_MULTIPROC_DIR_KEEP
1 parent e181d86 commit 2250e13

File tree

2 files changed

+2
-31
lines changed

2 files changed

+2
-31
lines changed

src/common/core/main.py

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -50,19 +50,10 @@ def ensure_cli_env() -> typing.Generator[None, None, None]:
5050
"PROMETHEUS_MULTIPROC_DIR",
5151
DEFAULT_PROMETHEUS_MULTIPROC_DIR,
5252
)
53-
prometheus_multiproc_dir_keep = env.bool(
54-
"PROMETHEUS_MULTIPROC_DIR_KEEP",
55-
default=False,
56-
)
57-
if not prometheus_multiproc_dir_keep:
58-
shutil.rmtree(prometheus_multiproc_dir_name, ignore_errors=True)
59-
logger.info(
60-
"Removed %s to ensure a clean state for Prometheus multi-process mode",
61-
prometheus_multiproc_dir_name,
62-
)
53+
shutil.rmtree(prometheus_multiproc_dir_name, ignore_errors=True)
6354
os.makedirs(prometheus_multiproc_dir_name, exist_ok=True)
6455
logger.info(
65-
"Created %s for Prometheus multi-process mode",
56+
"Re-created %s for Prometheus multi-process mode",
6657
prometheus_multiproc_dir_name,
6758
)
6859

tests/integration/core/test_main.py

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -128,26 +128,6 @@ def test_main__prometheus_multiproc_remove_dir_on_start_default__expected(
128128
assert not fs.exists("/tmp/flagsmith-prometheus/some_metric_file.db")
129129

130130

131-
def test_main__prometheus_multiproc_remove_dir_on_start_true__expected(
132-
monkeypatch: pytest.MonkeyPatch,
133-
fs: FakeFilesystem,
134-
) -> None:
135-
# Given
136-
monkeypatch.delenv("PROMETHEUS_MULTIPROC_DIR", raising=False)
137-
monkeypatch.setenv("PROMETHEUS_MULTIPROC_DIR_KEEP", "true")
138-
139-
fs.create_file(
140-
"/tmp/flagsmith-prometheus/some_metric_file.db",
141-
create_missing_dirs=True,
142-
)
143-
144-
# When
145-
main(["flagsmith"])
146-
147-
# Then
148-
assert fs.exists("/tmp/flagsmith-prometheus/some_metric_file.db")
149-
150-
151131
def test_main__no_django_configured__expected_0(
152132
monkeypatch: pytest.MonkeyPatch,
153133
) -> None:

0 commit comments

Comments
 (0)