${message}
`); + const execution_time_msg = __('Exection Time: {0} sec', [this.execution_time || 0.1]); + + this.page.footer.removeClass('hide').addClass('text-muted col-md-12') + .html(`${message}${execution_time_msg}`); } message_div(message) { diff --git a/frappe/tests/test_global_search.py b/frappe/tests/test_global_search.py index 4cae44060b..7f7dc0ed78 100644 --- a/frappe/tests/test_global_search.py +++ b/frappe/tests/test_global_search.py @@ -42,8 +42,10 @@ class TestGlobalSearch(unittest.TestCase): repeat_on='Every Month', starts_on=frappe.utils.now_datetime())).insert() + global_search.sync_global_search() frappe.db.commit() + def test_search(self): self.insert_test_events() results = global_search.search('awakens') @@ -61,7 +63,7 @@ class TestGlobalSearch(unittest.TestCase): event.subject = test_subject event.save() frappe.db.commit() - + global_search.sync_global_search() results = global_search.search('testing global search') self.assertTrue('testing global search' in results[0].content) @@ -87,6 +89,7 @@ class TestGlobalSearch(unittest.TestCase): self.assertEqual(len(results), 1) frappe.delete_doc('Event', event_name) + global_search.sync_global_search() results = global_search.search(test_subject) self.assertEqual(len(results), 0) @@ -111,6 +114,7 @@ class TestGlobalSearch(unittest.TestCase): }) doc.insert() + global_search.sync_global_search() frappe.db.commit() def test_get_field_value(self): diff --git a/frappe/utils/global_search.py b/frappe/utils/global_search.py index 1c078a1691..581a75cdaf 100644 --- a/frappe/utils/global_search.py +++ b/frappe/utils/global_search.py @@ -6,6 +6,7 @@ from __future__ import unicode_literals import frappe import re import redis +import json from frappe.utils import cint, strip_html_tags from frappe.model.base_document import get_controller from frappe.model.db_schema import varchar_len @@ -76,6 +77,9 @@ def rebuild_for_doctype(doctype): :param doctype: Doctype """ + if frappe.local.conf.get('disable_global_search'): + return + def _get_filters(): filters = frappe._dict({ "docstatus": ["!=", 2] }) if meta.has_field("enabled"): @@ -228,17 +232,17 @@ def insert_values_for_multiple_docs(all_contents): def update_global_search(doc): """ Add values marked with `in_global_search` to - `frappe.flags.update_global_search` from given doc + `global_search_queue` from given doc :param doc: Document to be added to global search """ + if frappe.local.conf.get('disable_global_search'): + return + if doc.docstatus > 1 or (doc.meta.has_field("enabled") and not doc.get("enabled")) \ or doc.get("disabled"): return - if frappe.flags.update_global_search==None: - frappe.flags.update_global_search = [] - content = [] for field in doc.meta.get_global_search_fields(): if doc.get(field.fieldname) and field.fieldtype != "Table": @@ -264,30 +268,21 @@ def update_global_search(doc): title = (doc.get_title() or '')[:int(varchar_len)] route = doc.get('route') if doc else '' - frappe.flags.update_global_search.append( - dict( - doctype=doc.doctype, - name=doc.name, - content=' ||| '.join(content or ''), - published=published, - title=title, - route=route - ) + value = dict( + doctype=doc.doctype, + name=doc.name, + content=' ||| '.join(content or ''), + published=published, + title=title, + route=route ) - enqueue_global_search() - - -def enqueue_global_search(): - if frappe.flags.update_global_search: try: - frappe.enqueue('frappe.utils.global_search.sync_global_search', - now=frappe.flags.in_test or frappe.flags.in_install or frappe.flags.in_migrate, - flags=frappe.flags.update_global_search, enqueue_after_commit=True) + # append to search queue if connected + frappe.cache().lpush('global_search_queue', json.dumps(value)) except redis.exceptions.ConnectionError: - sync_global_search() - - frappe.flags.update_global_search = [] + # not connected, sync directly + sync_value(value) def get_formatted_value(value, field): @@ -308,30 +303,30 @@ def get_formatted_value(value, field): return field.label + " : " + strip_html_tags(text_type(value)) -def sync_global_search(flags=None): +def sync_global_search(): """ - Add values from `flags` (frappe.flags.update_global_search) to __global_search. - This is called internally at the end of the request. + Inserts / updates values from `global_search_queue` to __global_search. + This is called via job scheduler :param flags: :return: """ + while frappe.cache().llen('global_search_queue') > 0: + value = json.loads(frappe.cache().lpop('global_search_queue')) + sync_value(value) - if not flags: - flags = frappe.flags.update_global_search - - # Can pass flags manually as frappe.flags.update_global_search isn't reliable at a later time, - # when syncing is enqueued - for value in flags: - frappe.db.sql(''' - insert into __global_search - (doctype, name, content, published, title, route) - values - (%(doctype)s, %(name)s, %(content)s, %(published)s, %(title)s, %(route)s) - on duplicate key update - content = %(content)s''', value) - - frappe.flags.update_global_search = [] +def sync_value(value): + ''' + Sync a given document to global search + :param value: dict of { doctype, name, content, published, title, route } + ''' + frappe.db.sql(''' + insert into __global_search + (doctype, name, content, published, title, route) + values + (%(doctype)s, %(name)s, %(content)s, %(published)s, %(title)s, %(route)s) + on duplicate key update + content = %(content)s''', value) def delete_for_document(doc): """ diff --git a/frappe/utils/redis_wrapper.py b/frappe/utils/redis_wrapper.py index 1ac3667138..cb92ced5c6 100644 --- a/frappe/utils/redis_wrapper.py +++ b/frappe/utils/redis_wrapper.py @@ -10,6 +10,13 @@ from six import iteritems class RedisWrapper(redis.Redis): """Redis client that will automatically prefix conf.db_name""" + def connected(self): + try: + self.ping() + return True + except redis.exceptions.ConnectionError: + return False + def make_key(self, key, user=None, shared=False): if shared: return key