External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-09 10:27:37 -02:30
Code Issues Packages Projects Releases Wiki Activity

drop lines picked up during merge resolution

Browse Source
This commit is contained in:
Jim Ladd
2021-10-20 15:13:01 -07:00
parent 89bee9d512
commit a0e07d3644
1 changed files with 0 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/main/tasks.py
View File

@@ -3098,9 +3098,6 @@ class AWXReceptorJob:
receptor_ctl.simple_command(f"work release {self.unit_id}") receptor_ctl.simple_command(f"work release {self.unit_id}")
except RuntimeError: except RuntimeError:
logger.exception(f"Unable to release work item {self.unit_id} from {self.task.instance.log_format}") logger.exception(f"Unable to release work item {self.unit_id} from {self.task.instance.log_format}")
# If an error occured without the job itself failing, it could be a broken instance
if self.work_type == 'ansible-runner' and ((res is None) or (getattr(res, 'rc', None) is None)):
execution_node_health_check.delay(self.task.instance.execution_node)
@property @property
def sign_work(self): def sign_work(self):