Selaa lähdekoodia

[fix] dont check permissions for setting log

version-14
Rushabh Mehta 8 vuotta sitten
vanhempi
commit
43a515c677
3 muutettua tiedostoa jossa 28 lisäystä ja 24 poistoa
  1. +2
    -1
      frappe/__init__.py
  2. +1
    -0
      frappe/integration_broker/doctype/integration_service/integration_service.py
  3. +25
    -23
      frappe/integrations/razorpay.py

+ 2
- 1
frappe/__init__.py Näytä tiedosto

@@ -1250,7 +1250,8 @@ def logger(module=None, with_more_info=True):


def log_error(message, title=None): def log_error(message, title=None):
'''Log error to Scheduler Log''' '''Log error to Scheduler Log'''
get_doc(dict(doctype='Scheduler Log', error=str(message), method=title)).insert()
get_doc(dict(doctype='Scheduler Log', error=str(message),
method=title)).insert(ignore_permissions=True)


def get_desk_link(doctype, name): def get_desk_link(doctype, name):
return '<a href="#Form/{0}/{1}" style="font-weight: bold;">{2} {1}</a>'.format(doctype, name, _(doctype)) return '<a href="#Form/{0}/{1}" style="font-weight: bold;">{2} {1}</a>'.format(doctype, name, _(doctype))


+ 1
- 0
frappe/integration_broker/doctype/integration_service/integration_service.py Näytä tiedosto

@@ -57,6 +57,7 @@ class IntegrationService(Document):
return frappe.flags.integration_request.json() return frappe.flags.integration_request.json()


except Exception, exc: except Exception, exc:
frappe.log_error(frappe.get_traceback())
raise exc raise exc


def post_request(self, url, auth=None, data=None): def post_request(self, url, auth=None, data=None):


+ 25
- 23
frappe/integrations/razorpay.py Näytä tiedosto

@@ -145,29 +145,31 @@ class Controller(IntegrationController):
redirect_to = data.get('notes', {}).get('redirect_to') or None redirect_to = data.get('notes', {}).get('redirect_to') or None
redirect_message = data.get('notes', {}).get('redirect_message') or None redirect_message = data.get('notes', {}).get('redirect_message') or None


if self.integration_request.status != "Authorized":
try:
for tries in xrange(3):
resp = self.get_request("https://api.razorpay.com/v1/payments/{0}"
.format(self.data.razorpay_payment_id), auth=(settings.api_key,
settings.api_secret))

if resp.get('status') == 'created':
# just created wait for a few seconds and try again
import time
time.sleep(0.5)

elif resp.get("status") == "authorized":
self.integration_request.db_set('status', 'Authorized', update_modified=False)
self.flags.status_changed_to = "Authorized"
break

except:
frappe.log_error(frappe.get_traceback())
# failed
pass

status = frappe.flags.integration_request.status_code
try:
for tries in xrange(3):
resp = self.get_request("https://api.razorpay.com/v1/payments/{0}"
.format(self.data.razorpay_payment_id), auth=(settings.api_key,
settings.api_secret))

if resp.get('status') == 'created':
# just created wait for a few seconds and try again
import time
time.sleep(0.5)

elif resp.get("status") == "authorized":
self.integration_request.db_set('status', 'Authorized', update_modified=False)
self.flags.status_changed_to = "Authorized"
break

if self.flags.status_changed_to != 'Authorized':
frappe.log_error(str(resp), 'Razorpay Payment not authorized')

except:
frappe.log_error(frappe.get_traceback())
# failed
pass

status = frappe.flags.integration_request.status_code


if self.flags.status_changed_to == "Authorized": if self.flags.status_changed_to == "Authorized":
if self.data.reference_doctype and self.data.reference_docname: if self.data.reference_doctype and self.data.reference_docname:


Ladataan…
Peruuta
Tallenna