Skip to content

Commit

Permalink
Merge pull request #27 from aclowes/health-check
Browse files Browse the repository at this point in the history
add healthcheck api
  • Loading branch information
aclowes authored Aug 30, 2017
2 parents 37b5da6 + 08ae07b commit fcde0c3
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# Versions should comply with PEP440. For a discussion on single-sourcing
# the version across setup.py and the project code, see
# https://packaging.python.org/en/latest/single_source_version.html
version='0.1.5',
version='0.1.6',

description='Yet Another Workflow Engine, a subprocess-based DAG execution system',
long_description=long_description,
Expand Down
1 change: 1 addition & 0 deletions yawn/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
# Tell Django that it is running behind a proxy and should forward HTTP->HTTPS
SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
SECURE_SSL_REDIRECT = True
SECURE_REDIRECT_EXEMPT = ['^api/healthy/$']

# Custom YAWN settings

Expand Down
3 changes: 2 additions & 1 deletion yawn/urls.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.conf.urls import include, url
from django.http import HttpResponse
from rest_framework import routers

from yawn.task.views import TaskViewSet, ExecutionViewSet
Expand All @@ -21,5 +22,5 @@
# Additionally, we include login URLs for the browsable API.
urlpatterns = [
url(r'^api/', include(router.urls)),
url(r'^api-auth/', include('rest_framework.urls'))
url(r'^api/healthy/$', lambda x: HttpResponse('ok')),
]

0 comments on commit fcde0c3

Please sign in to comment.