Skip to content

Support old-style MIDDLEWARE_CLASSES #68

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
merged 1 commit into from
Mar 26, 2018
Merged

Support old-style MIDDLEWARE_CLASSES #68

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
32 changes: 23 additions & 9 deletions instana/django.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,32 @@ def load_middleware_wrapper(wrapped, instance, args, kwargs):
try:
from django.conf import settings

if DJ_INSTANA_MIDDLEWARE in settings.MIDDLEWARE:
return

if type(settings.MIDDLEWARE) is tuple:
settings.MIDDLEWARE = (DJ_INSTANA_MIDDLEWARE,) + settings.MIDDLEWARE
elif type(settings.MIDDLEWARE) is list:
settings.MIDDLEWARE = [DJ_INSTANA_MIDDLEWARE] + settings.MIDDLEWARE
# Django >=1.10 to <2.0 support old-style MIDDLEWARE_CLASSES so we
# do as well here
if hasattr(settings, 'MIDDLEWARE_CLASSES'):
if DJ_INSTANA_MIDDLEWARE in settings.MIDDLEWARE_CLASSES:
return wrapped(*args, **kwargs)

if type(settings.MIDDLEWARE_CLASSES) is tuple:
settings.MIDDLEWARE_CLASSES = (DJ_INSTANA_MIDDLEWARE,) + settings.MIDDLEWARE_CLASSES
elif type(settings.MIDDLEWARE_CLASSES) is list:
settings.MIDDLEWARE_CLASSES = [DJ_INSTANA_MIDDLEWARE] + settings.MIDDLEWARE_CLASSES
else:
logger.warn("Instana: Couldn't add InstanaMiddleware to Django")
elif hasattr(settings, 'MIDDLEWARE'):
if DJ_INSTANA_MIDDLEWARE in settings.MIDDLEWARE:
return wrapped(*args, **kwargs)

if type(settings.MIDDLEWARE) is tuple:
settings.MIDDLEWARE = (DJ_INSTANA_MIDDLEWARE,) + settings.MIDDLEWARE
elif type(settings.MIDDLEWARE) is list:
settings.MIDDLEWARE = [DJ_INSTANA_MIDDLEWARE] + settings.MIDDLEWARE
else:
logger.warn("Instana: Couldn't add InstanaMiddleware to Django")
else:
logger.warn("Instana: Couldn't add InstanaMiddleware to Django")
logger.warn("Instana: Couldn't find middleware settings")

return wrapped(*args, **kwargs)

except Exception as e:
logger.warn("Instana: Couldn't add InstanaMiddleware to Django: ", e)

Expand Down