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

put lock file in project root dir

Browse Source
This commit is contained in:
Chris Meyers
2017-04-11 16:53:13 -04:00
parent 648aa470d7
commit 7919c47370
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/main/models/projects.py
View File

@@ -210,9 +210,9 @@ class ProjectOptions(models.Model):
def get_lock_file(self): def get_lock_file(self):
proj_path = self.get_project_path() proj_path = self.get_project_path()
if proj_path: if not proj_path:
return os.path.join(proj_path, 'tower_sync.lock') return None
return None return proj_path + '.lock'
class Project(UnifiedJobTemplate, ProjectOptions, ResourceMixin): class Project(UnifiedJobTemplate, ProjectOptions, ResourceMixin):

2
awx/main/tasks.py
View File

@@ -1326,7 +1326,7 @@ class RunProjectUpdate(BaseTask):
def acquire_lock(self, instance, blocking=True): def acquire_lock(self, instance, blocking=True):
lock_path = instance.get_lock_file() lock_path = instance.get_lock_file()
if lock_path is None: if lock_path is None:
raise RuntimeError(u'Invalid file %s' % instance.get_lock_file()) raise RuntimeError(u'Invalid lock file path')
# May raise IOError # May raise IOError
self.lock_fd = os.open(lock_path, os.O_RDONLY | os.O_CREAT) self.lock_fd = os.open(lock_path, os.O_RDONLY | os.O_CREAT)