From f5ede9c5c8bb2ebef362b374330c6d1200e6706b Mon Sep 17 00:00:00 2001 From: Malcolm Tredinnick Date: Sat, 17 Feb 2007 06:01:17 +0000 Subject: [PATCH] Fixed #3067 -- Improved caching of machine hostname to increase server restart times. Thanks SmileyChris. git-svn-id: http://code.djangoproject.com/svn/django/trunk@4536 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/core/mail.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/django/core/mail.py b/django/core/mail.py index a5af6e610f..cc99659adb 100644 --- a/django/core/mail.py +++ b/django/core/mail.py @@ -8,7 +8,18 @@ import socket import time import random -DNS_NAME = socket.getfqdn() # Cache the hostname +# Cache the hostname, but do it lazily: socket.getfqdn() can take a couple of +# seconds, which slows down the restart of the server. +class CachedDnsName(object): + def __str__(self): + return self.get_fqdn() + + def get_fqdn(self): + if not hasattr(self, '_fqdn'): + self._fqdn = socket.getfqdn() + return self._fqdn + +DNS_NAME = CachedDnsName() class BadHeaderError(ValueError): pass