From 241f0e11fab54b2c251b9198ba50bec86c4edf73 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: May 22 2017 20:36:59 +0000 Subject: API should not lock Signed-off-by: Patrick Uiterwijk --- diff --git a/pagure/api/__init__.py b/pagure/api/__init__.py index f94ef66..f600bc5 100644 --- a/pagure/api/__init__.py +++ b/pagure/api/__init__.py @@ -87,12 +87,10 @@ class APIERROR(enum.Enum): ENOGROUP = 'Group not found' -def get_authorized_api_project(SESSION, repo, user=None, namespace=None, - with_lock=False): +def get_authorized_api_project(SESSION, repo, user=None, namespace=None): ''' Helper function to get an authorized_project with optional lock. ''' repo = pagure.get_authorized_project( - SESSION, repo, user=user, namespace=namespace, with_lock=with_lock) - flask.g.repo_locked = with_lock + SESSION, repo, user=user, namespace=namespace) flask.g.repo = repo return repo diff --git a/pagure/api/ci/jenkins.py b/pagure/api/ci/jenkins.py index 88f4210..e539ab6 100644 --- a/pagure/api/ci/jenkins.py +++ b/pagure/api/ci/jenkins.py @@ -45,7 +45,7 @@ def jenkins_ci_notification( """ project = pagure.lib._get_project( - SESSION, repo, user=username, namespace=namespace, with_lock=True) + SESSION, repo, user=username, namespace=namespace) flask.g.repo_locked = True flask.g.repo = project if not project: diff --git a/pagure/api/issue.py b/pagure/api/issue.py index 31dcfe6..140dc88 100644 --- a/pagure/api/issue.py +++ b/pagure/api/issue.py @@ -27,7 +27,7 @@ from pagure.api import ( ) -def _get_repo(repo_name, username=None, namespace=None, with_lock=False): +def _get_repo(repo_name, username=None, namespace=None): """Check if repository exists and get repository name :param repo_name: name of repository :param username: @@ -37,8 +37,7 @@ def _get_repo(repo_name, username=None, namespace=None, with_lock=False): :return: repository name """ repo = get_authorized_api_project( - SESSION, repo_name, user=username, namespace=namespace, - with_lock=with_lock) + SESSION, repo_name, user=username, namespace=namespace) if repo is None: raise pagure.exceptions.APIError( @@ -194,7 +193,7 @@ def api_new_issue(repo, username=None, namespace=None): """ output = {} - repo = _get_repo(repo, username, namespace, with_lock=True) + repo = _get_repo(repo, username, namespace) _check_issue_tracker(repo) if flask.g.token.project and repo != flask.g.token.project: @@ -678,7 +677,7 @@ def api_change_status_issue(repo, issueid, username=None, namespace=None): """ output = {} - repo = _get_repo(repo, username, namespace, with_lock=True) + repo = _get_repo(repo, username, namespace) _check_issue_tracker(repo) _check_token(repo, project_token=False) @@ -796,7 +795,7 @@ def api_change_milestone_issue(repo, issueid, username=None, namespace=None): """ # noqa output = {} - repo = _get_repo(repo, username, namespace, with_lock=True) + repo = _get_repo(repo, username, namespace) _check_issue_tracker(repo) _check_token(repo) @@ -895,7 +894,7 @@ def api_comment_issue(repo, issueid, username=None, namespace=None): """ output = {} - repo = _get_repo(repo, username, namespace, with_lock=True) + repo = _get_repo(repo, username, namespace) _check_issue_tracker(repo) _check_token(repo, project_token=False) @@ -975,7 +974,7 @@ def api_assign_issue(repo, issueid, username=None, namespace=None): """ output = {} - repo = _get_repo(repo, username, namespace, with_lock=True) + repo = _get_repo(repo, username, namespace) _check_issue_tracker(repo) _check_token(repo) @@ -1073,7 +1072,7 @@ def api_subscribe_issue(repo, issueid, username=None, namespace=None): """ # noqa output = {} - repo = _get_repo(repo, username, namespace, with_lock=True) + repo = _get_repo(repo, username, namespace) _check_issue_tracker(repo) _check_token(repo) @@ -1156,7 +1155,7 @@ def api_update_custom_field( """ # noqa output = {} - repo = _get_repo(repo, username, namespace, with_lock=True) + repo = _get_repo(repo, username, namespace) _check_issue_tracker(repo) _check_token(repo)