EbookFoundation
/
readthedocs.org
mirror of https://github.com/EbookFoundation/readthedocs.org.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5054 from dojutsu-user/reduce-logging-to-sentry 

Reduce logging to sentry
ghowardsit
Eric Holscher 2019-01-02 19:14:12 -05:00 committed by GitHub
parent ae991c4f13 babf98ec0c
commit 171b45c7bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
readthedocs/projects/tasks.py
View File

@ -60,6 +60,7 @@ from readthedocs.doc_builder.exceptions import (
ProjectBuildsSkippedError, ProjectBuildsSkippedError,
VersionLockedError, VersionLockedError,
YAMLParseError, YAMLParseError,
BuildEnvironmentWarning,
) )
from readthedocs.doc_builder.loader import get_builder_class from readthedocs.doc_builder.loader import get_builder_class
from readthedocs.doc_builder.python_environments import Conda, Virtualenv from readthedocs.doc_builder.python_environments import Conda, Virtualenv
@ -272,7 +273,18 @@ class SyncRepositoryTaskStep(SyncRepositoryMixin):
return False return False
@app.task(bind=True, max_retries=5, default_retry_delay=7 * 60) @app.task(
bind=True,
max_retries=5,
default_retry_delay=7 * 60,
throws=(
VersionLockedError,
ProjectBuildsSkippedError,
YAMLParseError,
BuildTimeoutError,
ProjectBuildsSkippedError
)
)
def update_docs_task(self, project_id, *args, **kwargs): def update_docs_task(self, project_id, *args, **kwargs):
step = UpdateDocsTaskStep(task=self) step = UpdateDocsTaskStep(task=self)
return step.run(project_id, *args, **kwargs) return step.run(project_id, *args, **kwargs)
@ -1022,7 +1034,7 @@ def update_search(version_pk, commit, delete_non_commit_files=True):
) )
@app.task(queue='web') @app.task(queue='web', throws=(BuildEnvironmentWarning,))
def symlink_project(project_pk): def symlink_project(project_pk):
project = Project.objects.get(pk=project_pk) project = Project.objects.get(pk=project_pk)
for symlink in [PublicSymlink, PrivateSymlink]: for symlink in [PublicSymlink, PrivateSymlink]:
@ -1030,7 +1042,7 @@ def symlink_project(project_pk):
sym.run() sym.run()
@app.task(queue='web') @app.task(queue='web', throws=(BuildEnvironmentWarning,))
def symlink_domain(project_pk, domain_pk, delete=False): def symlink_domain(project_pk, domain_pk, delete=False):
project = Project.objects.get(pk=project_pk) project = Project.objects.get(pk=project_pk)
domain = Domain.objects.get(pk=domain_pk) domain = Domain.objects.get(pk=domain_pk)
@ -1070,7 +1082,7 @@ def broadcast_remove_orphan_symlinks():
broadcast(type='web', task=remove_orphan_symlinks, args=[]) broadcast(type='web', task=remove_orphan_symlinks, args=[])
@app.task(queue='web') @app.task(queue='web', throws=(BuildEnvironmentWarning,))
def symlink_subproject(project_pk): def symlink_subproject(project_pk):
project = Project.objects.get(pk=project_pk) project = Project.objects.get(pk=project_pk)
for symlink in [PublicSymlink, PrivateSymlink]: for symlink in [PublicSymlink, PrivateSymlink]:

3
readthedocs/settings/base.py
View File

@ -266,6 +266,9 @@ class CommunityBaseSettings(Settings):
}, },
} }
# Sentry
SENTRY_CELERY_IGNORE_EXPECTED = True
# Docker # Docker
DOCKER_ENABLE = False DOCKER_ENABLE = False
DOCKER_IMAGE = 'readthedocs/build:2.0' DOCKER_IMAGE = 'readthedocs/build:2.0'