separate current and previous execution logs
Signed-off-by: Marc 'risson' Schmitt <marc.schmitt@risson.space>
This commit is contained in:
@ -18,6 +18,7 @@ class TaskSerializer(ModelSerializer):
|
|||||||
rel_obj_model = ReadOnlyField(source="rel_obj_content_type.model")
|
rel_obj_model = ReadOnlyField(source="rel_obj_content_type.model")
|
||||||
|
|
||||||
messages = LogEventSerializer(many=True, source="_messages")
|
messages = LogEventSerializer(many=True, source="_messages")
|
||||||
|
previous_messages = LogEventSerializer(many=True, source="_previous_messages")
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
model = Task
|
model = Task
|
||||||
@ -32,6 +33,7 @@ class TaskSerializer(ModelSerializer):
|
|||||||
"rel_obj_id",
|
"rel_obj_id",
|
||||||
"uid",
|
"uid",
|
||||||
"messages",
|
"messages",
|
||||||
|
"previous_messages",
|
||||||
"aggregated_status",
|
"aggregated_status",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|||||||
@ -38,15 +38,26 @@ class LoggingMiddleware(Middleware):
|
|||||||
def after_enqueue(self, broker: Broker, message: Message, delay: int):
|
def after_enqueue(self, broker: Broker, message: Message, delay: int):
|
||||||
task: Task = message.options["task"]
|
task: Task = message.options["task"]
|
||||||
task_created: bool = message.options["task_created"]
|
task_created: bool = message.options["task_created"]
|
||||||
|
if task_created:
|
||||||
task._messages.append(
|
task._messages.append(
|
||||||
Task._make_message(
|
Task._make_message(
|
||||||
str(type(self)),
|
str(type(self)),
|
||||||
TaskStatus.INFO,
|
TaskStatus.INFO,
|
||||||
"Task is being queued" if task_created else "Task is being retried",
|
"Task has been queued",
|
||||||
delay=delay,
|
delay=delay,
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
task.save(update_fields=("_messages",))
|
else:
|
||||||
|
task._previous_messages.extend(task._messages)
|
||||||
|
task._messages = [
|
||||||
|
Task._make_message(
|
||||||
|
str(type(self)),
|
||||||
|
TaskStatus.INFO,
|
||||||
|
"Task will be retried",
|
||||||
|
delay=delay,
|
||||||
|
)
|
||||||
|
]
|
||||||
|
task.save(update_fields=("_messages", "_previous_messages"))
|
||||||
|
|
||||||
def before_process_message(self, broker: Broker, message: Message):
|
def before_process_message(self, broker: Broker, message: Message):
|
||||||
task: Task = message.options["task"]
|
task: Task = message.options["task"]
|
||||||
|
|||||||
18
authentik/tasks/migrations/0003_task__previous_messages.py
Normal file
18
authentik/tasks/migrations/0003_task__previous_messages.py
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
# Generated by Django 5.1.11 on 2025-06-24 13:57
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("authentik_tasks", "0002_alter_task_aggregated_status"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name="task",
|
||||||
|
name="_previous_messages",
|
||||||
|
field=models.JSONField(default=list),
|
||||||
|
),
|
||||||
|
]
|
||||||
@ -39,6 +39,7 @@ class Task(SerializerModel, TaskBase):
|
|||||||
|
|
||||||
_uid = models.TextField(blank=True, null=True)
|
_uid = models.TextField(blank=True, null=True)
|
||||||
_messages = models.JSONField(default=list)
|
_messages = models.JSONField(default=list)
|
||||||
|
_previous_messages = models.JSONField(default=list)
|
||||||
|
|
||||||
aggregated_status = models.TextField(choices=TaskStatus.choices)
|
aggregated_status = models.TextField(choices=TaskStatus.choices)
|
||||||
|
|
||||||
|
|||||||
@ -60206,12 +60206,17 @@ components:
|
|||||||
type: array
|
type: array
|
||||||
items:
|
items:
|
||||||
$ref: '#/components/schemas/LogEvent'
|
$ref: '#/components/schemas/LogEvent'
|
||||||
|
previous_messages:
|
||||||
|
type: array
|
||||||
|
items:
|
||||||
|
$ref: '#/components/schemas/LogEvent'
|
||||||
aggregated_status:
|
aggregated_status:
|
||||||
$ref: '#/components/schemas/AggregatedStatusEnum'
|
$ref: '#/components/schemas/AggregatedStatusEnum'
|
||||||
required:
|
required:
|
||||||
- actor_name
|
- actor_name
|
||||||
- aggregated_status
|
- aggregated_status
|
||||||
- messages
|
- messages
|
||||||
|
- previous_messages
|
||||||
- rel_obj_app_label
|
- rel_obj_app_label
|
||||||
- rel_obj_model
|
- rel_obj_model
|
||||||
- uid
|
- uid
|
||||||
|
|||||||
@ -174,7 +174,10 @@ export class TaskList extends Table<Task> {
|
|||||||
return html` <td role="cell" colspan="3">
|
return html` <td role="cell" colspan="3">
|
||||||
<div class="pf-c-table__expandable-row-content">
|
<div class="pf-c-table__expandable-row-content">
|
||||||
<div class="pf-c-content">
|
<div class="pf-c-content">
|
||||||
|
<p>Current execution logs</p>
|
||||||
<ak-log-viewer .logs=${item?.messages}></ak-log-viewer>
|
<ak-log-viewer .logs=${item?.messages}></ak-log-viewer>
|
||||||
|
<p>Previous executions logs</p>
|
||||||
|
<ak-log-viewer .logs=${item?.previousMessages}></ak-log-viewer>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</td>`;
|
</td>`;
|
||||||
|
|||||||
Reference in New Issue
Block a user