Cleanup
This commit is contained in:
@@ -5,14 +5,13 @@ import logging
|
||||
|
||||
from .cleanup import cleanup_expired
|
||||
from .models import (
|
||||
create_tables,
|
||||
DoesNotExist,
|
||||
get_hostname,
|
||||
get_user,
|
||||
Hostname,
|
||||
User,
|
||||
)
|
||||
from .validation import encode_hostname, encode_zone, ValidationError
|
||||
from .dns import encode_dnsname, EncodingError
|
||||
|
||||
|
||||
def cmd_user_list(args, app):
|
||||
@@ -170,9 +169,9 @@ def cmd_hostname_add(args, app):
|
||||
|
||||
# Validate and encode hostname/zone
|
||||
try:
|
||||
hostname_str = encode_hostname(args.hostname)
|
||||
zone = encode_zone(args.zone)
|
||||
except ValidationError as e:
|
||||
hostname_str = encode_dnsname(args.hostname)
|
||||
zone = encode_dnsname(args.zone)
|
||||
except EncodingError as e:
|
||||
print(f"Error: {e}")
|
||||
return 1
|
||||
|
||||
@@ -214,9 +213,9 @@ def cmd_hostname_delete(args, app):
|
||||
"""Delete a hostname."""
|
||||
# Validate and encode hostname and zone
|
||||
try:
|
||||
hostname_str = encode_hostname(args.hostname)
|
||||
zone = encode_zone(args.zone)
|
||||
except ValidationError as e:
|
||||
hostname_str = encode_dnsname(args.hostname)
|
||||
zone = encode_dnsname(args.zone)
|
||||
except EncodingError as e:
|
||||
print(f"Error: {e}")
|
||||
return 1
|
||||
|
||||
@@ -260,9 +259,9 @@ def cmd_hostname_modify(args, app):
|
||||
"""Modify hostname settings."""
|
||||
# Validate and encode hostname and zone
|
||||
try:
|
||||
hostname_str = encode_hostname(args.hostname)
|
||||
zone = encode_zone(args.zone)
|
||||
except ValidationError as e:
|
||||
hostname_str = encode_dnsname(args.hostname)
|
||||
zone = encode_dnsname(args.zone)
|
||||
except EncodingError as e:
|
||||
print(f"Error: {e}")
|
||||
return 1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user