增加字典‘DISPATCHER_TRIGGER_TYPE’表示‘调度触发类型’
This commit is contained in:
parent
44ee8f39b3
commit
8c76f100a3
|
@ -107,3 +107,9 @@ class CONTENT_TYPE:
|
|||
"""HTTP请求体数据类型"""
|
||||
X_WWW_FORM_URLENCODED = 'application/x-www-form-urlencoded'
|
||||
FORM_DATA = 'multipart/form-data'
|
||||
|
||||
|
||||
class DISPATCHER_TRIGGER_TYPE:
|
||||
"""调度触发类型"""
|
||||
BY_HAND = '手工'
|
||||
BY_SCHEDULE = '定时任务'
|
||||
|
|
|
@ -13,7 +13,8 @@ import contextlib
|
|||
from app.template_global import sort_by_order_in_module, sort_by_order_in_project, sort_by_order_in_logic_controller
|
||||
from app.extensions import http_cookie_manager
|
||||
from app.cores.dictionaries import (ELEMENT_TYPE, STATUS, CASE_TYPE, DISPATCHER_STATUS, DISPATCHER_TYPE,
|
||||
DISPATCHER_END_TYPE, REPORT_RESULT, TOOL_TYPE, LOGIC_CONTROLLER_TYPE)
|
||||
DISPATCHER_END_TYPE, REPORT_RESULT, TOOL_TYPE, LOGIC_CONTROLLER_TYPE,
|
||||
DISPATCHER_TRIGGER_TYPE)
|
||||
from app.cores.logger import DispatcherLogger
|
||||
from app.models import (Case, Scene, Module, Project, Dispatcher, DispatcherDetail, Report, ReportCaseData,
|
||||
ReportCaseExpectationData, LogicController, DingTalkRobotSetting, Tool, ReportToolData,
|
||||
|
@ -994,7 +995,7 @@ def async_project_run(project_id):
|
|||
with app.test_request_context(): # 在线程中创建请求上下文,当栈中没有应用上下文时同时也会创建应用上下文
|
||||
# 将主线程请求上下文栈中的request和session放入子线程的请求上下文栈顶
|
||||
_request_ctx_stack.top.request = request
|
||||
session['dispatcher_trigger_type'] = '手动' # 调度触发类型
|
||||
session['dispatcher_trigger_type'] = DISPATCHER_TRIGGER_TYPE.BY_HAND # 调度触发类型
|
||||
_request_ctx_stack.top.session = session
|
||||
ProjectDispatcher(project_id=project_id).run()
|
||||
except Exception as e:
|
||||
|
@ -1009,7 +1010,7 @@ def apscheduler_async_project_run(project_id, app, request, session):
|
|||
with app.test_request_context(): # 在线程中创建请求上下文,当栈中没有应用上下文时同时也会创建应用上下文
|
||||
# 将主线程请求上下文栈中的request和session放入子线程的请求上下文栈顶
|
||||
_request_ctx_stack.top.request = request
|
||||
session['dispatcher_trigger_type'] = '定时任务' # 调度触发类型
|
||||
session['dispatcher_trigger_type'] = DISPATCHER_TRIGGER_TYPE.BY_SCHEDULE # 调度触发类型
|
||||
_request_ctx_stack.top.session = session
|
||||
ProjectDispatcher(project_id=project_id).run()
|
||||
except Exception as e:
|
||||
|
|
Loading…
Reference in New Issue