Skip to content

Fixes devstack settings to work with new version of debug toolbar #2627

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

Merged
davestgermain merged 1 commit into from
Feb 18, 2014
+17 −2
Merged

Fixes devstack settings to work with new version of debug toolbar #2627

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
3 changes: 2 additions & 1 deletion cms/envs/devstack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,8 @@
)

DEBUG_TOOLBAR_CONFIG = {
'INTERCEPT_REDIRECTS': False
'INTERCEPT_REDIRECTS': False,
'SHOW_TOOLBAR_CALLBACK': 'check_debug.should_show_debug_toolbar',
}

# To see stacktraces for MongoDB queries, set this to True.
Expand Down
14 changes: 14 additions & 0 deletions common/lib/check_debug.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
"""
Function to check debug status.
"""
import os

def should_show_debug_toolbar(request):
"""
Return True/False to determine whether to show the Django
Debug Toolbar.

If HIDE_TOOLBAR is set in the process environment, the
toolbar will be hidden.
"""
return not bool(os.getenv('HIDE_TOOLBAR', ''))
2 changes: 1 addition & 1 deletion lms/envs/devstack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@

DEBUG_TOOLBAR_CONFIG = {
'INTERCEPT_REDIRECTS': False,
'SHOW_TOOLBAR_CALLBACK': lambda _: True,
'SHOW_TOOLBAR_CALLBACK': 'check_debug.should_show_debug_toolbar',
Copy link

@gwprice gwprice Feb 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

dev.py just doesn't specify SHOW_TOOLBAR_CALLBACK; is there a compelling reason to add this? If so, then make the other environments match.

Copy link
Contributor Author

@davestgermain davestgermain Feb 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There already was a SHOW_TOOLBAR_CALLBACK in devstack but not in dev. I don't use dev settings. The compelling reason is that the toolbar won't show up in devstack otherwise.

Copy link

@gwprice gwprice Feb 18, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be added to cms/envs/devstack.py as well, then.

}

########################### PIPELINE #################################
Expand Down