mirror of
https://github.com/element-hq/synapse.git
synced 2024-12-19 01:21:09 +03:00
Oops! Clock.time
gives seconds
This commit is contained in:
parent
3958fdab77
commit
effebb3e88
1 changed files with 6 additions and 6 deletions
|
@ -395,25 +395,25 @@ class TaskScheduler:
|
||||||
function = self._actions[task.action]
|
function = self._actions[task.action]
|
||||||
|
|
||||||
def _occasional_report(
|
def _occasional_report(
|
||||||
task_log_context: LoggingContext, start_time: int
|
task_log_context: LoggingContext, start_time: float
|
||||||
) -> None:
|
) -> None:
|
||||||
"""
|
"""
|
||||||
Helper to log a 'Task continuing' line every so often.
|
Helper to log a 'Task continuing' line every so often.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
current_time = int(self._clock.time())
|
current_time = self._clock.time()
|
||||||
calling_context = set_current_context(task_log_context)
|
calling_context = set_current_context(task_log_context)
|
||||||
try:
|
try:
|
||||||
usage = task_log_context.get_resource_usage()
|
usage = task_log_context.get_resource_usage()
|
||||||
TaskScheduler._log_task_usage(
|
TaskScheduler._log_task_usage(
|
||||||
"continuing", task, usage, (current_time - start_time) * 0.001
|
"continuing", task, usage, current_time - start_time
|
||||||
)
|
)
|
||||||
finally:
|
finally:
|
||||||
set_current_context(calling_context)
|
set_current_context(calling_context)
|
||||||
|
|
||||||
async def wrapper() -> None:
|
async def wrapper() -> None:
|
||||||
with nested_logging_context(task.id) as log_context:
|
with nested_logging_context(task.id) as log_context:
|
||||||
start_time = int(self._clock.time())
|
start_time = self._clock.time()
|
||||||
occasional_status_call = self._clock.looping_call(
|
occasional_status_call = self._clock.looping_call(
|
||||||
_occasional_report,
|
_occasional_report,
|
||||||
TaskScheduler.OCCASIONAL_REPORT_INTERVAL_MS,
|
TaskScheduler.OCCASIONAL_REPORT_INTERVAL_MS,
|
||||||
|
@ -441,10 +441,10 @@ class TaskScheduler:
|
||||||
)
|
)
|
||||||
self._running_tasks.remove(task.id)
|
self._running_tasks.remove(task.id)
|
||||||
|
|
||||||
current_time = int(self._clock.time())
|
current_time = self._clock.time()
|
||||||
usage = log_context.get_resource_usage()
|
usage = log_context.get_resource_usage()
|
||||||
TaskScheduler._log_task_usage(
|
TaskScheduler._log_task_usage(
|
||||||
status.value, task, usage, (current_time - start_time) * 0.001
|
status.value, task, usage, current_time - start_time
|
||||||
)
|
)
|
||||||
occasional_status_call.stop()
|
occasional_status_call.stop()
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue