From cee891aa92ecc9a160034139d8652e63083d8d2f Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 24 Sep 2020 10:31:36 +0530 Subject: [PATCH 1/3] refactor: better logging for membership --- erpnext/non_profit/doctype/membership/membership.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/erpnext/non_profit/doctype/membership/membership.py b/erpnext/non_profit/doctype/membership/membership.py index f058004ff9..3147b51928 100644 --- a/erpnext/non_profit/doctype/membership/membership.py +++ b/erpnext/non_profit/doctype/membership/membership.py @@ -224,7 +224,8 @@ def trigger_razorpay_subscription(*args, **kwargs): member.subscription_activated = 1 member.save(ignore_permissions=True) except Exception as e: - log = frappe.log_error(e, "Error creating membership entry") + message = e + '\n\n' + frappe.get_traceback() + '\n\n' + payment.id + log = frappe.log_error(message, "Error creating membership entry for {0}".format(member.name)) notify_failure(log) return { 'status': 'Failed', 'reason': e} From 3ec67077a91f1ac64d5faa948c2cb40f83193f5d Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 30 Sep 2020 12:00:46 +0530 Subject: [PATCH 2/3] chore: use .format for message Co-authored-by: Sagar Vora --- erpnext/non_profit/doctype/membership/membership.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/non_profit/doctype/membership/membership.py b/erpnext/non_profit/doctype/membership/membership.py index 3147b51928..61f4bcad1e 100644 --- a/erpnext/non_profit/doctype/membership/membership.py +++ b/erpnext/non_profit/doctype/membership/membership.py @@ -224,7 +224,7 @@ def trigger_razorpay_subscription(*args, **kwargs): member.subscription_activated = 1 member.save(ignore_permissions=True) except Exception as e: - message = e + '\n\n' + frappe.get_traceback() + '\n\n' + payment.id + message = "{0}\n\n{1}\n\n{2}: {3}".format(e, frappe.get_traceback(), __("Payment ID"), payment.id) log = frappe.log_error(message, "Error creating membership entry for {0}".format(member.name)) notify_failure(log) return { 'status': 'Failed', 'reason': e} @@ -251,4 +251,4 @@ def get_plan_from_razorpay_id(plan_id): try: return plan[0]['name'] except: - return None \ No newline at end of file + return None From 86171a3fda141fe2e6c4676a32ea5c446cdd874c Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 30 Sep 2020 12:01:35 +0530 Subject: [PATCH 3/3] fix: translate error log --- erpnext/non_profit/doctype/membership/membership.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/non_profit/doctype/membership/membership.py b/erpnext/non_profit/doctype/membership/membership.py index 61f4bcad1e..4c85cb60e8 100644 --- a/erpnext/non_profit/doctype/membership/membership.py +++ b/erpnext/non_profit/doctype/membership/membership.py @@ -225,7 +225,7 @@ def trigger_razorpay_subscription(*args, **kwargs): member.save(ignore_permissions=True) except Exception as e: message = "{0}\n\n{1}\n\n{2}: {3}".format(e, frappe.get_traceback(), __("Payment ID"), payment.id) - log = frappe.log_error(message, "Error creating membership entry for {0}".format(member.name)) + log = frappe.log_error(message, _("Error creating membership entry for {0}").format(member.name)) notify_failure(log) return { 'status': 'Failed', 'reason': e}