Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resync webhooks from Admin #3933

Merged
merged 1 commit into from
Apr 10, 2018
+18 −0
Merged

Resync webhooks from Admin #3933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions readthedocs/oauth/services/bitbucket.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,6 +274,12 @@ def update_webhook(self, project, integration):
project,
)
return (True, resp)

# Bitbucket returns 404 when the webhook doesn't exist. In this
# case, we call ``setup_webhook`` to re-configure it from scratch
if resp.status_code == 404:
return self.setup_webhook(project)

# Catch exceptions with request or deserializing JSON
except (KeyError, RequestException, ValueError):
log.exception(
Expand Down
6 changes: 6 additions & 0 deletions readthedocs/oauth/services/github.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,6 +261,12 @@ def update_webhook(self, project, integration):
project,
)
return (True, resp)

# GitHub returns 404 when the webhook doesn't exist. In this case,
# we call ``setup_webhook`` to re-configure it from scratch
if resp.status_code == 404:
return self.setup_webhook(project)

# Catch exceptions with request or deserializing JSON
except (RequestException, ValueError):
log.exception(
Expand Down
6 changes: 6 additions & 0 deletions readthedocs/oauth/services/gitlab.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,6 +331,12 @@ def update_webhook(self, project, integration):
log.info(
'GitLab webhook update successful for project: %s', project)
return (True, resp)

# GitLab returns 404 when the webhook doesn't exist. In this case,
# we call ``setup_webhook`` to re-configure it from scratch
if resp.status_code == 404:
return self.setup_webhook(project)

# Catch exceptions with request or deserializing JSON
except (RequestException, ValueError):
log.exception(
Expand Down