diff --git a/systemd-service/openlab-task-deamon.service/manual-openlab-task b/systemd-service/openlab-task-deamon.service/manual-openlab-task index da3345aa848b1db7cb7e11fbafdca8774a735af6..4d1a816f8bd1405a6e664d18911b60f73a80839a 100755 --- a/systemd-service/openlab-task-deamon.service/manual-openlab-task +++ b/systemd-service/openlab-task-deamon.service/manual-openlab-task @@ -20,13 +20,18 @@ print('========================================') # post task result tasks = [ - #'20201205/R2020120500011' + #'20201209/R2020120900041-DC6_03_007', + #'20201209/R2020120900041-DC6_03_008', + #'20201209/R2020120900051-DC6_03_009', + #'20201209/R2020120900051-DC6_03_010' ] for task in tasks: task_info = TaskCommon().read_yaml('/srv/openlab-task/tasks/' + task) print('Post task info:\n%s' % task_info) - result = WebInteract().post_result(task_info) + task_info['result'] = 'Success' + task_info['msg'] = '发放成功' + result = WebInteract(TaskCommon().web_key).post_result(task_info) print('Post result:\n%s' % result) print('========================================') diff --git a/systemd-service/openlab-task-deamon.service/openlabTask/GetTask.py b/systemd-service/openlab-task-deamon.service/openlabTask/GetTask.py index 3bb29e710a4bc5860f5e238fee801588122eb371..4aaa65ec0415e258946f7b400a0d21c93deac9f2 100755 --- a/systemd-service/openlab-task-deamon.service/openlabTask/GetTask.py +++ b/systemd-service/openlab-task-deamon.service/openlabTask/GetTask.py @@ -83,7 +83,7 @@ class GetTask(TaskCommon): server_name = web_task.get('serverName') server_split = server_name.split("_") zone = server_split[0] - if not self.__check_new_task(task_id, operation, zone): + if not self.__check_new_task('-'.join((task_id, server_name)), operation, zone): continue status = 'prepared' @@ -136,5 +136,5 @@ class GetTask(TaskCommon): cur_path = os.path.join(self.task_path, str(time.strftime('%Y%m%d', \ time.localtime(time.time())))) self.execute_cmd('mkdir -p %s' % cur_path) - self.save_yaml(system_task_info, os.path.join(cur_path, task_id)) + self.save_yaml(system_task_info, os.path.join(cur_path, '-'.join((task_id, server_name))))