Skip to content

Commit

Permalink
Make logging more fine-grained (#265)
Browse files Browse the repository at this point in the history
  • Loading branch information
c-w committed Dec 22, 2019
1 parent 991d98c commit 2e1e0ef
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion helm/values.yaml
Expand Up @@ -11,7 +11,7 @@ worker:
queueWorkers: 1

logging:
level: DEBUG
level: INFO

letsencrypt:
email: ascoderu.opwen@gmail.com
Expand Down
10 changes: 5 additions & 5 deletions opwen_email_server/services/auth.py
Expand Up @@ -141,20 +141,20 @@ def __init__(self, storage: AzureTextStorage) -> None:
def insert(self, client_id: str, domain: str, owner: str):
self._storage.store_text(client_id, domain)
self._storage.store_text(domain, to_json({'client_id': client_id, 'owner': owner}))
self.log_debug('Registered client %s at domain %s', client_id, domain)
self.log_info('Registered client %s at domain %s', client_id, domain)

def is_owner(self, domain: str, username: str) -> bool:
try:
raw_auth = self._storage.fetch_text(domain)
except ObjectDoesNotExistError:
self.log_debug('Unrecognized domain %s', domain)
self.log_warning('Unrecognized domain %s', domain)
return False

try:
auth = from_json(raw_auth)
except JSONDecodeError:
# fallback for clients registered before November 2019
self.log_debug('Unable to lookup owner for domain %s', domain)
self.log_warning('Unable to lookup owner for domain %s', domain)
return False

return auth.get('owner') == username
Expand All @@ -168,7 +168,7 @@ def client_id_for(self, domain: str) -> Optional[str]:
try:
raw_auth = self._storage.fetch_text(domain)
except ObjectDoesNotExistError:
self.log_debug('Unrecognized domain %s', domain)
self.log_warning('Unrecognized domain %s', domain)
return None
else:
try:
Expand All @@ -183,7 +183,7 @@ def domain_for(self, client_id: str) -> Optional[str]:
try:
domain = self._storage.fetch_text(client_id)
except ObjectDoesNotExistError:
self.log_debug('Unrecognized client %s', client_id)
self.log_warning('Unrecognized client %s', client_id)
return None
else:
self.log_debug('Client %s has domain %s', client_id, domain)
Expand Down
8 changes: 4 additions & 4 deletions opwen_email_server/services/dns.py
Expand Up @@ -43,10 +43,10 @@ def _run(self, client_name: str, zone: Zone) -> None:
try:
record = next(record for record in self._driver.iterate_records(zone) if record.name == client_name)
except StopIteration:
self.log_debug('No MX records for client %s.%s exist', client_name, zone.domain)
self.log_warning('No MX records for client %s.%s exist', client_name, zone.domain)
else:
self._driver.delete_record(record)
self.log_debug('Deleted MX records for client %s.%s', client_name, zone.domain)
self.log_info('Deleted MX records for client %s.%s', client_name, zone.domain)


class SetupMxRecords(_MxRecords):
Expand All @@ -59,6 +59,6 @@ def _run(self, client_name: str, zone: Zone) -> None:
data=MX_RECORD,
)
except LibcloudError:
self.log_debug('MX records for client %s.%s already exist', client_name, zone.domain)
self.log_warning('MX records for client %s.%s already exist', client_name, zone.domain)
else:
self.log_debug('Set up MX records for client %s.%s', client_name, zone.domain)
self.log_info('Set up MX records for client %s.%s', client_name, zone.domain)
6 changes: 3 additions & 3 deletions opwen_email_server/services/sendgrid.py
Expand Up @@ -70,7 +70,7 @@ def _send_email(self, email: Mail, email_id: str) -> bool:
status = getattr(ex, 'code', -1)
self.log_exception(ex, 'error sending email %s:%s', email_id, email)
else:
self.log_debug('sent email %s', email_id)
self.log_info('sent email %s', email_id)

return status in (200, 201, 202)

Expand Down Expand Up @@ -151,7 +151,7 @@ def _run(self, client_id: str, domain: str) -> None:
if not response.ok and response.status_code != 404:
response.raise_for_status()

self.log_debug('Deleted mailbox for %s', domain)
self.log_info('Deleted mailbox for %s', domain)


class SetupSendgridMailbox(_SendgridManagement):
Expand Down Expand Up @@ -187,7 +187,7 @@ def _run(self, client_id: str, domain: str) -> None:
)

if create_response.ok:
self.log_debug('Set up mailbox for %s', domain)
self.log_info('Set up mailbox for %s', domain)
break

if retry > self._max_retries:
Expand Down

0 comments on commit 2e1e0ef

Please sign in to comment.