Merge branch 'frappe:version-15' into version-15

metalmon · Oct 26, 2024 · d4b2244 · d4b2244
2 parents 5290935 + 9fa1aa4
commit d4b2244
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/frappe/__init__.py b/frappe/__init__.py
@@ -50,7 +50,7 @@
 )
 from .utils.lazy_loader import lazy_import
 
-__version__ = "15.45.0"
+__version__ = "15.45.1"
 __title__ = "Frappe Framework"
 
 controllers = {}

diff --git a/frappe/monitor.py b/frappe/monitor.py
@@ -85,7 +85,7 @@ def collect_job_meta(self, method, kwargs):
 
 		if job := rq.get_current_job():
 			self.data.uuid = job.id
-			waitdiff = self.data.timestamp - job.enqueued_at
+			waitdiff = self.data.timestamp - job.enqueued_at.replace(tzinfo=pytz.UTC)
 			self.data.job.wait = int(waitdiff.total_seconds() * 1000000)
 
 	def add_custom_data(self, **kwargs):