vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

fix: trim extra / from producer url to overcome url mismatch

Browse source
This commit is contained in:
Rucha Mahabal 2020-01-27 13:51:58 +05:30
parent c0b22871fb
commit 38b99f7aa0
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
frappe/event_streaming/doctype/event_producer/event_producer.py
View file

@ -19,6 +19,7 @@ from frappe.integrations.oauth2 import validate_url
class EventProducer(Document):
def before_insert(self):
self.check_url()
self.incoming_change = True
self.create_event_consumer()
self.create_custom_fields()
@ -28,9 +29,6 @@ class EventProducer(Document):
for entry in self.producer_doctypes:
entry.status = 'Approved'
if not validate_url(self.producer_url):
frappe.throw(_('Invalid URL'))
def on_update(self):
if not self.incoming_change:
self.update_event_consumer()
@ -39,6 +37,15 @@ class EventProducer(Document):
# when producer doc is updated it updates the consumer doc, set flag to avoid deadlock
frappe.db.set_value(self.doctype, self.name, 'incoming_change', 0)
def check_url(self):
if not validate_url(self.producer_url):
frappe.throw(_('Invalid URL'))
# remove '/' from the end of the url like http://test_site.com/
# to prevent mismatch in get_url() results
if self.producer_url.endswith("/"):
self.producer_url = self.producer_url[:-1]
def create_event_consumer(self):
"""register event consumer on the producer site"""
if self.is_producer_online():