Better logging

This commit is contained in:
zandercymatics 2024-02-06 12:58:44 -07:00
parent aff6aad1d4
commit 8d476d5a80
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
2 changed files with 4 additions and 6 deletions

View file

@ -1147,15 +1147,12 @@ class DomainAdmin(ListHeaderAdmin):
def do_extend_expiration_date(self, request, obj): def do_extend_expiration_date(self, request, obj):
if not isinstance(obj, Domain): if not isinstance(obj, Domain):
# Could be problematic if the type is similar,
# but not the same (same field/func names).
# We do not want to accidentally delete records.
self.message_user(request, "Object is not of type Domain", messages.ERROR) self.message_user(request, "Object is not of type Domain", messages.ERROR)
return None return None
try: try:
obj.renew_domain(date_to_extend=date.today()) obj.renew_domain(date_to_extend=date.today())
except Exception as err: except RegistryError as err:
if err.code: if err.code:
self.message_user( self.message_user(
request, request,
@ -1169,8 +1166,9 @@ class DomainAdmin(ListHeaderAdmin):
messages.ERROR, messages.ERROR,
) )
else: else:
# all other type error messages, display the error
self.message_user(request, err, messages.ERROR) self.message_user(request, err, messages.ERROR)
except Exception as err:
self.message_user(request, err, messages.ERROR)
else: else:
updated_domain = Domain.objects.filter(id=obj).get() updated_domain = Domain.objects.filter(id=obj).get()
self.message_user( self.message_user(

View file

@ -255,7 +255,7 @@ class Domain(TimeStampedModel, DomainHelper):
# if no expiration date from registry, set it to today # if no expiration date from registry, set it to today
logger.warning("current expiration date not set; setting to today") logger.warning("current expiration date not set; setting to today")
date_to_extend = date.today() date_to_extend = date.today()
print(f"This is the date to extend: {date_to_extend} vs registry {self.registry_expiration_date}")
# create RenewDomain request # create RenewDomain request
request = commands.RenewDomain(name=self.name, cur_exp_date=date_to_extend, period=epp.Period(length, unit)) request = commands.RenewDomain(name=self.name, cur_exp_date=date_to_extend, period=epp.Period(length, unit))