forked from CGM_Public/pretix_original
Use more caching in multidomain module
This commit is contained in:
@@ -4,6 +4,7 @@ from urllib.parse import urlparse
|
||||
from django.conf import settings
|
||||
from django.contrib.sessions.middleware import \
|
||||
SessionMiddleware as BaseSessionMiddleware
|
||||
from django.core.cache import cache
|
||||
from django.core.exceptions import DisallowedHost
|
||||
from django.core.urlresolvers import set_urlconf
|
||||
from django.http.request import split_domain_port
|
||||
@@ -12,6 +13,7 @@ from django.utils.cache import patch_vary_headers
|
||||
from django.utils.deprecation import MiddlewareMixin
|
||||
from django.utils.http import cookie_date
|
||||
|
||||
from pretix.base.models import Organizer
|
||||
from pretix.multidomain.models import KnownDomain
|
||||
|
||||
LOCAL_HOST_NAMES = ('testserver', 'localhost')
|
||||
@@ -36,17 +38,26 @@ class MultiDomainMiddleware(MiddlewareMixin):
|
||||
if domain:
|
||||
request.host = domain
|
||||
request.port = int(port) if port else None
|
||||
try:
|
||||
kd = KnownDomain.objects.get(domainname=domain) # noqa
|
||||
request.domain = kd
|
||||
except:
|
||||
|
||||
orga = cache.get('pretix_multidomain_organizer_{}'.format(domain))
|
||||
if orga is None:
|
||||
try:
|
||||
kd = KnownDomain.objects.select_related('organizer').get(domainname=domain) # noqa
|
||||
orga = kd.organizer
|
||||
except KnownDomain.DoesNotExist:
|
||||
orga = False
|
||||
cache.set('pretix_multidomain_organizer_{}'.format(domain), orga.pk if orga else False, 3600)
|
||||
|
||||
if orga:
|
||||
print(orga)
|
||||
request.organizer = orga if isinstance(orga, Organizer) else Organizer.objects.get(pk=orga)
|
||||
request.urlconf = "pretix.multidomain.subdomain_urlconf"
|
||||
else:
|
||||
if settings.DEBUG or domain in LOCAL_HOST_NAMES or domain == default_domain:
|
||||
request.urlconf = "pretix.multidomain.maindomain_urlconf"
|
||||
else:
|
||||
raise DisallowedHost("Unknown host: %r" % host)
|
||||
else:
|
||||
request.organizer = kd.organizer
|
||||
request.urlconf = "pretix.multidomain.subdomain_urlconf"
|
||||
|
||||
else:
|
||||
raise DisallowedHost("Invalid HTTP_HOST header: %r." % host)
|
||||
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
from django.core.cache import cache
|
||||
from django.db import models
|
||||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
@@ -19,8 +20,10 @@ class KnownDomain(models.Model):
|
||||
super().save(*args, **kwargs)
|
||||
if self.organizer:
|
||||
self.organizer.get_cache().clear()
|
||||
cache.delete('pretix_multidomain_organizer_{}'.format(self.domainname))
|
||||
|
||||
def delete(self, *args, **kwargs):
|
||||
if self.organizer:
|
||||
self.organizer.get_cache().clear()
|
||||
cache.delete('pretix_multidomain_organizer_{}'.format(self.domainname))
|
||||
super().delete(*args, **kwargs)
|
||||
|
||||
Reference in New Issue
Block a user