diff options
| -rw-r--r-- | server/apps/policy.py | 8 | ||||
| -rw-r--r-- | server/apps/task.py | 7 |
2 files changed, 10 insertions, 5 deletions
diff --git a/server/apps/policy.py b/server/apps/policy.py index 29ef2be..8504c06 100644 --- a/server/apps/policy.py +++ b/server/apps/policy.py @@ -90,12 +90,14 @@ def copy_task_policy(task): return task_policy # ----------------------------------------调整中心---------------------------------------------------- - +p_num = 0 # 初始task_policy创建 def init_task_policy(task): policy_list = chiose_policy(task) - first_policy = random.choice(policy_list) - + global p_num + # first_policy = random.choice(policy_list) + first_policy = policy_list[p_num] + p_num+=1 task_policy = TaskPolicy( policy = first_policy.p_id, policy_param = first_policy.p_payload, diff --git a/server/apps/task.py b/server/apps/task.py index 428cbcf..b5517e8 100644 --- a/server/apps/task.py +++ b/server/apps/task.py @@ -91,7 +91,7 @@ def valid_task_info(task_param: dict): # 期望注入记录 "target_rr": String(required=False), # 期望策略 - "policy": String(validate=OneOf(["auto", "ddos", "sjqp"]), load_default="auto"), + "policy": String(validate=OneOf(["auto", "ddos", "sjqp", "ddos_f", "sjqp_f"]), load_default="auto"), # 状态感知方式 "scan": String(validate=OneOf(["auto", "icmp", "dns", "tcp", "record"]), load_default="auto"), # 策略切换时限,单位分钟 @@ -166,6 +166,8 @@ def make_task(json_data): # 任务策略初始化 task_policy = init_task_policy(task) + global p_num + p_num = 0 # 创建锚点 task_monitoring(task) @@ -262,7 +264,8 @@ def adjust_task(task): debug("再试试") task_policy = db.session.query(TaskPolicy).filter_by(for_task = task.task_id).order_by(TaskPolicy.tp_time.desc()).first() stop_task_deliver(task_policy) - center_process_unit(task) + # center_process_unit(task) + init_task_policy(task) task_policy = db.session.query(TaskPolicy).filter_by(for_task = task.task_id).order_by(TaskPolicy.tp_time.desc()).first() task.status = "working" db.session.commit() |