diff --git a/locust/stats.py b/locust/stats.py index 90b90a18b9..745360b397 100644 --- a/locust/stats.py +++ b/locust/stats.py @@ -791,7 +791,7 @@ def stats_history(runner): break if runner.state != "stopped": r = { - "time": datetime.datetime.now().strftime("%H:%M:%S"), + "time": datetime.datetime.utcnow().strftime("%H:%M:%S"), "current_rps": stats.total.current_rps or 0, "current_fail_per_sec": stats.total.current_fail_per_sec or 0, "response_time_percentile_95": stats.total.get_current_response_time_percentile(0.95) or 0, diff --git a/locust/templates/report.html b/locust/templates/report.html index 98949431fd..94b88174e3 100644 --- a/locust/templates/report.html +++ b/locust/templates/report.html @@ -44,7 +44,7 @@

Locust Test Report

{% if show_download_link %}

Download the Report

{% endif %} -

During: {{ start_time }} - {{ end_time }}

+

During: {{ start_time }} - {{ end_time }}

Target Host: {{ host }}

@@ -219,6 +219,14 @@

Charts

] }); } + + $(".l10n.datetime").html((index, currentContent) => { + if (!currentContent || !currentContent.includes(" ") || !currentContent.includes(":")) { + return currentContent; + } + + return new Date(Date.parse(currentContent.replace(" ", "T") + ".000Z")).toLocaleString(); + }); diff --git a/locust/templates/stats_data.html b/locust/templates/stats_data.html index 2219f1db38..8adc13b657 100644 --- a/locust/templates/stats_data.html +++ b/locust/templates/stats_data.html @@ -1,6 +1,6 @@ {% set time_data = [] %}{% set user_count_data = [] %}{% set current_rps_data = [] %}{% set current_fail_per_sec_data = [] %}{% set response_time_percentile_50_data = [] %}{% set response_time_percentile_95_data = [] %}{% for r in history %}{% do time_data.append(r.time) %}{% do user_count_data.append({"value": r.user_count}) %}{% do current_rps_data.append({"value": r.current_rps, "users": r.user_count}) %}{% do current_fail_per_sec_data.append({"value": r.current_fail_per_sec, "users": r.user_count}) %}{% do response_time_percentile_50_data.append({"value": r.response_time_percentile_50, "users": r.user_count}) %}{% do response_time_percentile_95_data.append({"value": r.response_time_percentile_95, "users": r.user_count}) %}{% endfor %} var stats_history = { - "time": {{ time_data | tojson }}, + "time": {{ time_data | tojson }}.map(server_time => new Date(new Date().setUTCHours(...(server_time.split(":")))).toLocaleTimeString()), "user_count": {{ user_count_data | tojson }}, "current_rps": {{ current_rps_data | tojson }}, "current_fail_per_sec": {{ current_fail_per_sec_data | tojson }},