Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
E
edx-platform
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
edx-platform
Commits
a75f64b6
Commit
a75f64b6
authored
Oct 06, 2016
by
Andy Armstrong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move service_status from common into openedx
parent
f0550b15
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
10 additions
and
9 deletions
+10
-9
cms/envs/common.py
+1
-1
cms/urls.py
+1
-1
lms/envs/common.py
+1
-1
lms/urls.py
+1
-1
openedx/core/djangoapps/service_status/__init__.py
+0
-0
openedx/core/djangoapps/service_status/tasks.py
+0
-0
openedx/core/djangoapps/service_status/test.py
+0
-0
openedx/core/djangoapps/service_status/urls.py
+3
-3
openedx/core/djangoapps/service_status/views.py
+3
-2
No files found.
cms/envs/common.py
View file @
a75f64b6
...
...
@@ -808,7 +808,7 @@ INSTALLED_APPS = (
'config_models'
,
# Monitor the status of services
'service_status'
,
'
openedx.core.djangoapps.
service_status'
,
# Testing
'django_nose'
,
...
...
cms/urls.py
View file @
a75f64b6
...
...
@@ -148,7 +148,7 @@ if settings.FEATURES.get('ENABLE_EXPORT_GIT'):
if
settings
.
FEATURES
.
get
(
'ENABLE_SERVICE_STATUS'
):
urlpatterns
+=
patterns
(
''
,
url
(
r'^status/'
,
include
(
'service_status.urls'
)),
url
(
r'^status/'
,
include
(
'
openedx.core.djangoapps.
service_status.urls'
)),
)
if
settings
.
FEATURES
.
get
(
'AUTH_USE_CAS'
):
...
...
lms/envs/common.py
View file @
a75f64b6
...
...
@@ -1876,7 +1876,7 @@ INSTALLED_APPS = (
'config_models'
,
# Monitor the status of services
'service_status'
,
'
openedx.core.djangoapps.
service_status'
,
# Display status message to students
'status'
,
...
...
lms/urls.py
View file @
a75f64b6
...
...
@@ -891,7 +891,7 @@ if settings.FEATURES.get('ENABLE_SQL_TRACKING_LOGS'):
if
settings
.
FEATURES
.
get
(
'ENABLE_SERVICE_STATUS'
):
urlpatterns
+=
(
url
(
r'^status/'
,
include
(
'service_status.urls'
)),
url
(
r'^status/'
,
include
(
'
openedx.core.djangoapps.
service_status.urls'
)),
)
if
settings
.
FEATURES
.
get
(
'ENABLE_INSTRUCTOR_BACKGROUND_TASKS'
):
...
...
common
/djangoapps/service_status/__init__.py
→
openedx/core
/djangoapps/service_status/__init__.py
View file @
a75f64b6
File moved
common
/djangoapps/service_status/tasks.py
→
openedx/core
/djangoapps/service_status/tasks.py
View file @
a75f64b6
File moved
common
/djangoapps/service_status/test.py
→
openedx/core
/djangoapps/service_status/test.py
View file @
a75f64b6
File moved
common
/djangoapps/service_status/urls.py
→
openedx/core
/djangoapps/service_status/urls.py
View file @
a75f64b6
...
...
@@ -7,9 +7,9 @@ from django.conf.urls import patterns, url
urlpatterns
=
patterns
(
''
,
url
(
r'^$'
,
'service_status.views.index'
,
name
=
'status.service.index'
),
url
(
r'^celery/$'
,
'service_status.views.celery_status'
,
url
(
r'^$'
,
'
openedx.core.djangoapps.
service_status.views.index'
,
name
=
'status.service.index'
),
url
(
r'^celery/$'
,
'
openedx.core.djangoapps.
service_status.views.celery_status'
,
name
=
'status.service.celery.status'
),
url
(
r'^celery/ping/$'
,
'service_status.views.celery_ping'
,
url
(
r'^celery/ping/$'
,
'
openedx.core.djangoapps.
service_status.views.celery_ping'
,
name
=
'status.service.celery.ping'
),
)
common
/djangoapps/service_status/views.py
→
openedx/core
/djangoapps/service_status/views.py
View file @
a75f64b6
...
...
@@ -9,10 +9,11 @@ from django.http import HttpResponse
from
dogapi
import
dog_stats_api
from
service_status
import
tasks
from
djcelery
import
celery
from
celery.exceptions
import
TimeoutError
from
openedx.core.djangoapps.service_status.tasks
import
delayed_ping
def
index
(
_
):
"""
...
...
@@ -37,7 +38,7 @@ def celery_ping(_):
A Simple view that checks if Celery can process a simple task
"""
start
=
time
.
time
()
result
=
tasks
.
delayed_ping
.
apply_async
((
'ping'
,
0.1
))
result
=
delayed_ping
.
apply_async
((
'ping'
,
0.1
))
task_id
=
result
.
id
# Wait until we get the result
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment