perf

Author: cle-b

Diff for: httpdbg/hooks/external.py

@@ -16,13 +16,10 @@
 
 @contextmanager
 def watcher_external(records: HTTPRecords) -> Generator[HTTPRecords, None, None]:
-    remove_environment_variable = False
-
     if HTTPDBG_MULTIPROCESS_DIR not in os.environ:
         with tempfile.TemporaryDirectory(prefix="httpdbg") as httpdbg_multiprocess_dir:
 
             logger().info(f"watcher_external {httpdbg_multiprocess_dir}")
-            remove_environment_variable = True
             os.environ[HTTPDBG_MULTIPROCESS_DIR] = httpdbg_multiprocess_dir
 
             # we use a custom sitecustomize.py script to record the request in the subprocesses.
@@ -52,10 +49,6 @@ def watcher_external(records: HTTPRecords) -> Generator[HTTPRecords, None, None]
                 yield records
             finally:
                 watcher.shutdown()
-                if remove_environment_variable and (
-                    HTTPDBG_MULTIPROCESS_DIR in os.environ
-                ):
-                    del os.environ[HTTPDBG_MULTIPROCESS_DIR]
     else:
         yield records
 
@@ -77,7 +70,7 @@ def load_dump(self):
                 self.records.groups.update(newrecords.groups)
 
     def run(self):
-        while self._running and (HTTPDBG_MULTIPROCESS_DIR in os.environ):
+        while self._running:
             self.load_dump()
             time.sleep(self.delay)
 

Diff for: tests/test_multiprocess.py

@@ -3,11 +3,16 @@
 import pytest
 
 from httpdbg import httprecord
+from httpdbg.env import HTTPDBG_MULTIPROCESS_DIR
 from httpdbg.mode_script import run_script
 
 
 @pytest.mark.script
 def test_run_script_multithread(httpbin):
+
+    if HTTPDBG_MULTIPROCESS_DIR in os.environ:
+        del os.environ[HTTPDBG_MULTIPROCESS_DIR]
+
     with httprecord() as records:
         os.environ["HTTPDBG_TEST_MULTITHREAD_BASE_URL"] = httpbin.url
         script_to_run = os.path.join(
@@ -24,6 +29,10 @@ def test_run_script_multithread(httpbin):
 
 @pytest.mark.script
 def test_run_script_multiprocess(httpbin):
+
+    if HTTPDBG_MULTIPROCESS_DIR in os.environ:
+        del os.environ[HTTPDBG_MULTIPROCESS_DIR]
+
     with httprecord() as records:
         os.environ["HTTPDBG_TEST_MULTIPROCESS_BASE_URL"] = httpbin.url
         script_to_run = os.path.join(