locust 2.18.1.dev10__tar.gz → 2.18.1.dev16__tar.gz

{locust-2.18.1.dev10/locust.egg-info → locust-2.18.1.dev16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: locust
-Version: 2.18.1.dev10
+Version: 2.18.1.dev16
 Summary: Developer friendly load testing framework
 License: MIT
 Project-URL: Homepage, https://locust.io/

{locust-2.18.1.dev10 → locust-2.18.1.dev16}/locust/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.18.1.dev10'
-__version_tuple__ = version_tuple = (2, 18, 1, 'dev10')
+__version__ = version = '2.18.1.dev16'
+__version_tuple__ = version_tuple = (2, 18, 1, 'dev16')

{locust-2.18.1.dev10 → locust-2.18.1.dev16}/locust/log.py

@@ -9,6 +9,15 @@ HOSTNAME = socket.gethostname()
 unhandled_greenlet_exception = False
 
 
+class LogReader(logging.Handler):
+    def __init__(self):
+        super().__init__()
+        self.logs = []
+
+    def emit(self, record):
+        self.logs.append(self.format(record))
+
+
 def setup_logging(loglevel, logfile=None):
     loglevel = loglevel.upper()
 
@@ -32,21 +41,22 @@ def setup_logging(loglevel, logfile=None):
                 "class": "logging.StreamHandler",
                 "formatter": "plain",
             },
+            "log_reader": {"class": "locust.log.LogReader", "formatter": "default"},
         },
         "loggers": {
             "locust": {
-                "handlers": ["console"],
+                "handlers": ["console", "log_reader"],
                 "level": loglevel,
                 "propagate": False,
             },
             "locust.stats_logger": {
-                "handlers": ["console_plain"],
+                "handlers": ["console_plain", "log_reader"],
                 "level": "INFO",
                 "propagate": False,
             },
         },
         "root": {
-            "handlers": ["console"],
+            "handlers": ["console", "log_reader"],
             "level": loglevel,
         },
     }
@@ -58,8 +68,8 @@ def setup_logging(loglevel, logfile=None):
             "filename": logfile,
             "formatter": "default",
         }
-        LOGGING_CONFIG["loggers"]["locust"]["handlers"] = ["file"]
-        LOGGING_CONFIG["root"]["handlers"] = ["file"]
+        LOGGING_CONFIG["loggers"]["locust"]["handlers"] = ["file", "log_reader"]
+        LOGGING_CONFIG["root"]["handlers"] = ["file", "log_reader"]
 
     logging.config.dictConfig(LOGGING_CONFIG)
 

{locust-2.18.1.dev10 → locust-2.18.1.dev16}/locust/test/test_web.py

@@ -5,13 +5,13 @@ import os
 import re
 import textwrap
 import traceback
+import logging
 from io import StringIO
 from tempfile import NamedTemporaryFile, TemporaryDirectory
 
 import gevent
 import requests
 from pyquery import PyQuery as pq
-
 import locust
 from locust import constant, LoadTestShape
 from locust.argument_parser import get_parser, parse_options
@@ -21,6 +21,7 @@ from locust.runners import Runner
 from locust import stats
 from locust.stats import StatsCSVFileWriter
 from locust.web import WebUI
+from locust.log import LogReader
 
 from .mock_locustfile import mock_locustfile
 from .testcases import LocustTestCase
@@ -1013,6 +1014,19 @@ class TestWebUI(LocustTestCase, _HeaderCheckMixin):
         self.assertIn("Script: <span>locust.py</span>", str(d))
         self.assertIn("Target Host: <span>http://localhost</span>", str(d))
 
+    def test_logs(self):
+        log_handler = LogReader()
+        log_handler.name = "log_reader"
+        log_handler.setLevel(logging.INFO)
+        logger = logging.getLogger("root")
+        logger.addHandler(log_handler)
+        log_line = "some log info"
+        logger.info(log_line)
+
+        response = requests.get("http://127.0.0.1:%i/logs" % self.web_port)
+
+        self.assertIn(log_line, response.json().get("logs"))
+
 
 class TestWebUIAuth(LocustTestCase):
     def setUp(self):

{locust-2.18.1.dev10 → locust-2.18.1.dev16}/locust/web.py

@@ -136,6 +136,12 @@ class WebUI:
         if not delayed_start:
             self.start()
 
+        @app.errorhandler(Exception)
+        def handle_exception(error):
+            error_message = str(error)
+            logger.log(logging.CRITICAL, error_message)
+            return make_response(error_message, 500)
+
         @app.route("/assets/<path:path>")
         def send_assets(path):
             webui_build_path = self.webui_build_path
@@ -478,6 +484,20 @@ class WebUI:
             }
             return task_data
 
+        @app.route("/logs")
+        @self.auth_required_if_enabled
+        def logs():
+            log_reader_handler = [
+                handler for handler in logging.getLogger("root").handlers if handler.name == "log_reader"
+            ]
+
+            if log_reader_handler:
+                logs = log_reader_handler[0].logs
+            else:
+                logs = []
+
+            return jsonify({"logs": logs})
+
     def start(self):
         self.greenlet = gevent.spawn(self.start_server)
         self.greenlet.link_exception(greenlet_exception_handler)