|
@@ -274,7 +274,11 @@ def process_job_start_event_rules(sender, **kwargs):
|
|
|
"""
|
|
"""
|
|
|
Process event rules for jobs starting.
|
|
Process event rules for jobs starting.
|
|
|
"""
|
|
"""
|
|
|
- event_rules = EventRule.objects.filter(type_job_start=True, enabled=True, object_types=sender.object_type)
|
|
|
|
|
|
|
+ event_rules = EventRule.objects.filter(
|
|
|
|
|
+ event_types__contains=[JOB_STARTED],
|
|
|
|
|
+ enabled=True,
|
|
|
|
|
+ object_types=sender.object_type
|
|
|
|
|
+ )
|
|
|
username = sender.user.username if sender.user else None
|
|
username = sender.user.username if sender.user else None
|
|
|
process_event_rules(
|
|
process_event_rules(
|
|
|
event_rules=event_rules,
|
|
event_rules=event_rules,
|
|
@@ -290,7 +294,11 @@ def process_job_end_event_rules(sender, **kwargs):
|
|
|
"""
|
|
"""
|
|
|
Process event rules for jobs terminating.
|
|
Process event rules for jobs terminating.
|
|
|
"""
|
|
"""
|
|
|
- event_rules = EventRule.objects.filter(type_job_end=True, enabled=True, object_types=sender.object_type)
|
|
|
|
|
|
|
+ event_rules = EventRule.objects.filter(
|
|
|
|
|
+ event_types__contains=[JOB_COMPLETED],
|
|
|
|
|
+ enabled=True,
|
|
|
|
|
+ object_types=sender.object_type
|
|
|
|
|
+ )
|
|
|
username = sender.user.username if sender.user else None
|
|
username = sender.user.username if sender.user else None
|
|
|
process_event_rules(
|
|
process_event_rules(
|
|
|
event_rules=event_rules,
|
|
event_rules=event_rules,
|