Changeset 6180

Timestamp:

09/14/07 03:37:09 (1 year ago)

Author:

mtredinnick

Message:

Fixed #3766 -- Added in-memory caching for the sites framework. Will speed up all the "current site" lookups. Thanks, Matt Riggott.

Files:

• django/trunk/django/contrib/sites/models.py (modified) (2 diffs)
• django/trunk/docs/sites.txt (modified) (1 diff)

django/trunk/django/contrib/sites/models.py

@@ -3 +3 @@
-from django.http import get_host
-
+SITE_CACHE = {}
+
-class SiteManager(models.Manager):
-    def get_current(self):
+        """
+        Returns the current ``Site`` based on the SITE_ID in the
+        project's settings. The ``Site`` object is cached the first
+        time it's retrieved from the database.
+        """
-        from django.conf import settings
-        try:
@@ -11 +18 @@
-            from django.core.exceptions import ImproperlyConfigured
-            raise ImproperlyConfigured("You're using the Django \"sites framework\" without having set the SITE_ID setting. Create a site in your database and set the SITE_ID setting to fix this error.")
-
+
+
+
+
+
+
+
+
+
+
+
-
-class Site(models.Model):

django/trunk/docs/sites.txt

@@ -213 +213 @@
-    >>> 'http://%s%s' % (Site.objects.get_current().domain, obj.get_absolute_url())
-    'http://example.com/mymodel/objects/3/'
+
+Caching the current ``Site`` object
+===================================
+
+**New in Django development version**
+
+As the current site is stored in the database, each call to
+``Site.objects.get_current()`` could result in a database query. But Django is a
+little cleverer than that: on the first request, the current site is cached, and
+any subsequent call returns the cached data instead of hitting the database.
+
+If for any reason you want to force a database query, you can tell Django to
+clear the cache using ``Site.objects.clear_cache()``::
+
+    # First call; current site fetched from database.
+    current_site = Site.objects.get_current()
+    # ...
+
+    # Second call; current site fetched from cache.
+    current_site = Site.objects.get_current()
+    # ...
+
+    # Force a database query for the third call.
+    Site.objects.clear_cache()
+    current_site = Site.objects.get_current()
-
-The ``CurrentSiteManager``