Skip to content

Commit

Permalink
Updated exception log messages
Browse files Browse the repository at this point in the history
  • Loading branch information
dougpenny committed Aug 15, 2024
1 parent cb56e90 commit a14d1da
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 30 deletions.
2 changes: 1 addition & 1 deletion api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def todays_menu_items(request):
).filter(Q(category=MenuItem.ENTREE) | Q(app_only=True))
except Exception as e:
logger.error(
f"API: An error occurred while fetching today's menu items.\nError message {e}"
f"API: An exception occurred while fetching today's menu items.\nException: {e}"
)
return Response(status=status.HTTP_404_NOT_FOUND)

Expand Down
6 changes: 2 additions & 4 deletions cafeteria/pssync.py
Original file line number Diff line number Diff line change
Expand Up @@ -142,12 +142,10 @@ def sync_powerschool_staff(client=None):
grade_level = homeroom_roster[count]["grade_level"]
count = count + 1
staff.grade = GradeLevel.objects.get(value=int(grade_level))
except Exception:
except Exception as e:
staff.grade = None
logger.error(
"No grade level assigned to homeroom teacher: {}".format(
staff.name()
)
f"No grade level assigned to homeroom teacher: {staff}\nException: {e}"
)
staff.students.clear()
for student in homeroom_roster:
Expand Down
10 changes: 6 additions & 4 deletions cafeteria/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ def delete_order(request):
return redirect("home")
except Exception as e:
logger.exception(
f"An exception occured when trying to delete a transaction. {e}"
f"An exception occured when trying to delete a transaction: {transaction}\nException: {e}"
)
messages.error(request, "There was a problem deleting your order.")
return redirect("todays-order")
Expand All @@ -134,7 +134,9 @@ def home(request):
if request.user.profile.role == Profile.GUARDIAN:
return redirect("guardian")
except Exception as e:
logger.exception(f"An exception occured for user {request.user}: {e}")
logger.exception(
f"An exception occured for user {request.user}\nException: {e}"
)
return redirect("django_auth_adfs:logout")

if todays_transaction(request.user.profile):
Expand All @@ -159,7 +161,7 @@ def home(request):
ordered_items_list.append(menu_item)
except Exception as e:
logger.exception(
f"An exception occured when an order was submitted: {e}"
f"An exception occured when adding a menu item: {menu_item}\nException: {e}"
)

if len(ordered_items_list) < 1:
Expand Down Expand Up @@ -218,7 +220,7 @@ def home(request):
return redirect("todays-order")
except Exception as e:
logger.exception(
f"An exception occured when trying to create a transaction: {e}"
f"An exception occured when trying to create a transaction: {transaction}\nException: {e}"
)
messages.error(
request, "There was a problem submitting your order."
Expand Down
12 changes: 7 additions & 5 deletions profiles/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -141,9 +141,9 @@ def set_inactive(request, pk):
request, "Successfully set {} as inactive.".format(profile.name())
)
return redirect("admin")
except Exception:
except Exception as e:
logger.info(
"An error occured when trying to set {} as inactive".format(profile.name())
f"An exception occured when trying to set {profile} as inactive.\nException: {e}"
)
messages.error(
request,
Expand All @@ -166,8 +166,10 @@ def set_all_inactive(request):

messages.info(request, f"Successfully set {count} users as inactive.")
return redirect("admin")
except Exception:
logger.info("An error occured when trying to set users as inactive")
except Exception as e:
logger.info(
"An exception occured when trying to set users as inactive.\nException: {e}"
)
messages.error(request, "An error occured trying to set users as inactive")

return redirect("pending-inactive")
Expand Down Expand Up @@ -198,7 +200,7 @@ def new_individual_card(request, pk):
if transaction:
transaction.delete()
logger.info(
"An error occured trying to print a new lunch card: {}".format(e)
f"An exception occured trying to print a new lunch card for: {profile}\nException: {e}"
)
messages.error(
request, "An error occured trying to print the new lunch card."
Expand Down
28 changes: 12 additions & 16 deletions transactions/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ def process_order(self, order: Transaction):
transactee.save()
except Exception as e:
logger.error(
f"An error occured attempting to process order: {order}\nError message: {e}"
f"An exception occured attempting to process order: {order}\nException: {e}"
)

def process_daily_orders(self, day: date) -> Tuple[bool, str]:
Expand All @@ -80,7 +80,7 @@ def process_daily_orders(self, day: date) -> Tuple[bool, str]:
raise Exception
except Exception as e:
logger.error(
f"When processing transactions, no transactions found for: {day}\nError message: {e}"
f"When processing transactions, no transactions found for: {day}\nException: {e}"
)
return (
False,
Expand All @@ -97,7 +97,7 @@ def process_single_order(self, id: int) -> Tuple[bool, str]:
raise Exception
except Exception as e:
logger.error(
f"When processing a transaction, no transaction found for id: {id}\nError message: {e}"
f"When processing a transaction, no transaction found for id: {id}\nException: {e}"
)
return (
False,
Expand Down Expand Up @@ -144,7 +144,9 @@ def post(self, request, *args, **kwargs):
transaction.delete()
messages.success(self.request, "The transaction was successfully deleted.")
except Exception as e:
logger.error("An error occured when deleting a transaction: {}".format(e))
logger.error(
f"An exception occured when deleting a transaction: {transaction}\nException: {e}"
)
messages.error(self.request, "There was a problem deleting the transaction")
return redirect(request.POST.get("path"))

Expand Down Expand Up @@ -454,14 +456,12 @@ def batch_deposit(request):
count = count + 1
except Exception as e:
logger.exception(
"An error occured processing batch deposits: {}".format(e)
f"An exception occured processing batch deposits.\nDeposit: {new_deposit}\nException: {e}"
)
messages.error(
request, "An error occured processing the batch deposits."
)
messages.success(
request, "Successfully processed {} deposits.".format(count)
)
messages.success(request, f"Successfully processed {count} deposits.")
return redirect("transaction-deposits-batch")
else:
context["form"] = DepositFormSet(prefix="deposit")
Expand Down Expand Up @@ -607,7 +607,7 @@ def new_single_deposit(request):
return redirect("profile-detail", profile.id)
except Exception as e:
logger.error(
f"An exception occured when trying to create a deposit.\nTransaction: {new_deposit}\nException: {e}"
f"An exception occured when trying to create a deposit: {new_deposit}\nException: {e}"
)
messages.error(
request, "An error occured creating the deposit, please try again."
Expand All @@ -632,7 +632,7 @@ def new_single_order(request):
ordered_items_list.append(item["menu_item"])
except Exception as e:
logger.error(
f"An error occurred attempting to append ordered items list with item {item}.\nError message: {e}"
f"An exception occurred attempting to append ordered items list with item {item}.\nException: {e}"
)

if len(ordered_items_list) < 1:
Expand Down Expand Up @@ -664,16 +664,12 @@ def new_single_order(request):
)
messages.success(
request,
"Successfully created an order for {}.".format(
transactee.name()
),
f"Successfully created an order for {transactee.name()}.",
)
return redirect("profile-detail", transactee.id)
except Exception as e:
logger.exception(
"An exception occured when trying to create a transaction: {}".format(
e
)
f"An exception occured when trying to create a transaction: {transaction}\nException: {e}"
)
messages.error(request, "An error occured creating the order.")
return redirect("transaction-order-create")
Expand Down

0 comments on commit a14d1da

Please sign in to comment.