added os.path and module import

This commit is contained in:
Lucas Dias
2022-03-25 14:26:00 +01:00
parent 18b1440d7c
commit 01ce3440eb

View File

@@ -4,6 +4,7 @@
from decimal import Decimal from decimal import Decimal
import random import random
import logging import logging
import os
from django.core.validators import MinValueValidator from django.core.validators import MinValueValidator
from django.db import models, connection from django.db import models, connection
@@ -187,7 +188,7 @@ class Instance(HasPolicyEditsMixin, BaseModel):
""" """
vargs = dict() vargs = dict()
if settings.AWX_CLEANUP_PATHS: if settings.AWX_CLEANUP_PATHS:
vargs['file_pattern'] = '{}/{}*'.format(settings.AWX_ISOLATION_BASE_PATH, JOB_FOLDER_PREFIX % '*') vargs['file_pattern'] = os.path.join(settings.AWX_ISOLATION_BASE_PATH, JOB_FOLDER_PREFIX % '*') + '*'
vargs.update(kwargs) vargs.update(kwargs)
if 'exclude_strings' not in vargs and vargs.get('file_pattern'): if 'exclude_strings' not in vargs and vargs.get('file_pattern'):
active_pks = list(UnifiedJob.objects.filter(execution_node=self.hostname, status__in=('running', 'waiting')).values_list('pk', flat=True)) active_pks = list(UnifiedJob.objects.filter(execution_node=self.hostname, status__in=('running', 'waiting')).values_list('pk', flat=True))