diff --git a/src/docker-compose.yml b/src/docker-compose.yml index d64ba80d5..8cb2bd60f 100644 --- a/src/docker-compose.yml +++ b/src/docker-compose.yml @@ -25,7 +25,7 @@ services: # Run Django in debug mode on local - DJANGO_DEBUG=True # Set DJANGO_LOG_LEVEL in env - - DJANGO_LOG_LEVEL + - DJANGO_LOG_LEVEL=DEBUG # Run Django without production flags - IS_PRODUCTION=False # Tell Django where it is being hosted diff --git a/src/registrar/config/settings.py b/src/registrar/config/settings.py index d2689242a..da58eee86 100644 --- a/src/registrar/config/settings.py +++ b/src/registrar/config/settings.py @@ -476,8 +476,10 @@ class JsonServerFormatter(ServerFormatter): def format(self, record): formatted_record = super().format(record) + if not hasattr(record, "server_time"): record.server_time = self.formatTime(record, self.datefmt) + log_entry = {"server_time": record.server_time, "level": record.levelname, "message": formatted_record} return json.dumps(log_entry) diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py index b9e3315d5..7f793f3e0 100644 --- a/src/registrar/models/domain_request.py +++ b/src/registrar/models/domain_request.py @@ -831,7 +831,6 @@ def _send_status_update_email( if custom_email_content: context["custom_email_content"] = custom_email_content - send_templated_email( email_template, email_template_subject, @@ -877,7 +876,6 @@ def submit(self): DraftDomain = apps.get_model("registrar.DraftDomain") if not DraftDomain.string_could_be_domain(self.requested_domain.name): raise ValueError("Requested domain is not a valid domain name.") - # if the domain has not been submitted before this must be the first time if not self.first_submitted_date: self.first_submitted_date = timezone.now().date() diff --git a/src/registrar/templates/domain_users.html b/src/registrar/templates/domain_users.html index c41902c6f..a2eb3e604 100644 --- a/src/registrar/templates/domain_users.html +++ b/src/registrar/templates/domain_users.html @@ -8,7 +8,7 @@

Domain managers

Domain managers can update all information related to a domain within the - .gov registrar, including including security email and DNS name servers. + .gov registrar, including security email and DNS name servers.