Skip to content

Commit abf174f

Browse files
committed
fix: ensure redeployment only occurs for active scheduled triggers
--bug=1065978@tapd-62980211 --user=刘瑞斌 【触发器】定时触发器改成事件触发后,定时触发任务依然会执行 https://www.tapd.cn/62980211/s/1842826
1 parent 744dcf3 commit abf174f

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

apps/trigger/handler/simple_tools.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,5 @@ def undeploy(trigger, **kwargs):
5353
@return:
5454
"""
5555
for simple_trigger_handler in simple_trigger_handlers:
56-
if simple_trigger_handler.support(trigger, **kwargs):
57-
return simple_trigger_handler.undeploy(trigger, **kwargs)
56+
return simple_trigger_handler.undeploy(trigger, **kwargs)
5857
raise Exception("不支持的触发器类型")

apps/trigger/serializers/task_source_trigger.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ def edit(self, instance: Dict, with_valid=True):
154154
raise serializers.ValidationError(_('Trigger must have at least one task'))
155155

156156
if need_redeploy:
157-
if trigger.is_active:
157+
if trigger.is_active and trigger.trigger_type == 'SCHEDULED':
158158
deploy(TriggerModelSerializer(trigger).data, **{})
159159
else:
160160
undeploy(TriggerModelSerializer(trigger).data, **{})

apps/trigger/serializers/trigger.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ def edit(self, instance: Dict, with_valid=True):
536536

537537
# 重新部署触发器任务
538538
if need_redeploy:
539-
if trigger.is_active:
539+
if trigger.is_active and trigger.trigger_type == 'SCHEDULED':
540540
deploy(TriggerModelSerializer(trigger).data, **{})
541541
else:
542542
undeploy(TriggerModelSerializer(trigger).data, **{})

0 commit comments

Comments
 (0)