locust 2.45.1.dev29__tar.gz → 2.45.1.dev35__tar.gz

{locust-2.45.1.dev29 → locust-2.45.1.dev35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: locust
-Version: 2.45.1.dev29
+Version: 2.45.1.dev35
 Summary: Developer-friendly load testing framework
 Project-URL: homepage, https://locust.io/
 Project-URL: repository, https://github.com/locustio/locust

{locust-2.45.1.dev29 → locust-2.45.1.dev35}/locust/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '2.45.1.dev29'
-__version_tuple__ = version_tuple = (2, 45, 1, 'dev29')
+__version__ = version = '2.45.1.dev35'
+__version_tuple__ = version_tuple = (2, 45, 1, 'dev35')
 
 __commit_id__ = commit_id = None

{locust-2.45.1.dev29 → locust-2.45.1.dev35}/locust/main.py

@@ -325,10 +325,11 @@ def main():
             )
 
     if os.name != "nt":
+        minimum_open_file_limit = 10000
+        soft_limit = None
         try:
             import resource
 
-            minimum_open_file_limit = 10000
             (soft_limit, hard_limit) = resource.getrlimit(resource.RLIMIT_NOFILE)
 
             if soft_limit < minimum_open_file_limit:
@@ -336,9 +337,9 @@ def main():
                 # It does not work on all OS:es, but we should be no worse off for trying.
                 limits = minimum_open_file_limit, hard_limit
                 resource.setrlimit(resource.RLIMIT_NOFILE, limits)
-        except BaseException:
+        except Exception:
             logger.warning(
-                f"""System open file limit '{soft_limit} is below minimum setting '{minimum_open_file_limit}'.
+                f"""System open file limit '{soft_limit}' is below minimum setting '{minimum_open_file_limit}'.
 It's not high enough for load testing, and the OS didn't allow locust to increase it by itself.
 See https://github.com/locustio/locust/wiki/Installation#increasing-maximum-number-of-open-files-limit for more info."""
             )

{locust-2.45.1.dev29 → locust-2.45.1.dev35}/locust/runners.py

@@ -1010,6 +1010,7 @@ class MasterRunner(DistributedRunner):
                 logging.debug(
                     "Got KeyboardInterrupt in client_listener. Other greenlets should catch this and shut down."
                 )
+                continue
             self.handle_message(client_id, msg)
 
     def handle_message(self, client_id: str, msg: Message) -> None: