From f3b959b1fe89fb4ea66e88b3f600c9869da791d5 Mon Sep 17 00:00:00 2001 From: Aditya Hase Date: Tue, 28 Aug 2018 15:31:20 +0530 Subject: [PATCH] frappe: refactor async to realtime (#6015) * frappe: refactor async to realtime * frappe: refactor async to is_async --- frappe/__init__.py | 10 +++++----- frappe/app.py | 1 - frappe/core/doctype/data_import/importer.py | 1 - frappe/database.py | 3 +-- frappe/handler.py | 1 - frappe/hooks.py | 2 +- frappe/{async.py => realtime.py} | 0 frappe/utils/background_jobs.py | 2 +- socketio.js | 4 ++-- 9 files changed, 10 insertions(+), 14 deletions(-) rename frappe/{async.py => realtime.py} (100%) diff --git a/frappe/__init__.py b/frappe/__init__.py index 673c0521b8..f6a8b5c2b6 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -339,7 +339,7 @@ def throw(msg, exc=ValidationError, title=None): msgprint(msg, raise_exception=exc, title=title, indicator='red') def emit_js(js, user=False, **kwargs): - from frappe.async import publish_realtime + from frappe.realtime import publish_realtime if user == False: user = session.user publish_realtime('eval_js', js, user=user, **kwargs) @@ -1376,8 +1376,8 @@ def publish_progress(*args, **kwargs): :param doctype: Optional, for DocType :param name: Optional, for Document name """ - import frappe.async - return frappe.async.publish_progress(*args, **kwargs) + import frappe.realtime + return frappe.realtime.publish_progress(*args, **kwargs) def publish_realtime(*args, **kwargs): """Publish real-time updates @@ -1390,9 +1390,9 @@ def publish_realtime(*args, **kwargs): :param docname: Transmit to doctype, docname :param after_commit: (default False) will emit after current transaction is committed """ - import frappe.async + import frappe.realtime - return frappe.async.publish_realtime(*args, **kwargs) + return frappe.realtime.publish_realtime(*args, **kwargs) def local_cache(namespace, key, generator, regenerate_if_none=False): """A key value store for caching within a request diff --git a/frappe/app.py b/frappe/app.py index ea346a0417..d07c42dff2 100644 --- a/frappe/app.py +++ b/frappe/app.py @@ -17,7 +17,6 @@ import frappe import frappe.handler import frappe.auth import frappe.api -import frappe.async import frappe.utils.response import frappe.website.render from frappe.utils import get_site_name diff --git a/frappe/core/doctype/data_import/importer.py b/frappe/core/doctype/data_import/importer.py index c5b8c1a94b..299eb1de9d 100644 --- a/frappe/core/doctype/data_import/importer.py +++ b/frappe/core/doctype/data_import/importer.py @@ -7,7 +7,6 @@ from six.moves import range import requests import frappe, json, os import frappe.permissions -import frappe.async from frappe import _ diff --git a/frappe/database.py b/frappe/database.py index 14a61b22b7..bbfe6ad40a 100644 --- a/frappe/database.py +++ b/frappe/database.py @@ -9,7 +9,6 @@ import warnings import datetime import frappe import frappe.defaults -import frappe.async from time import time import re import frappe.model.meta @@ -813,7 +812,7 @@ class Database: def flush_realtime_log(self): for args in frappe.local.realtime_log: - frappe.async.emit_via_redis(*args) + frappe.realtime.emit_via_redis(*args) frappe.local.realtime_log = [] diff --git a/frappe/handler.py b/frappe/handler.py index db95ad4a96..16138edf62 100755 --- a/frappe/handler.py +++ b/frappe/handler.py @@ -5,7 +5,6 @@ from __future__ import unicode_literals import frappe from frappe import _ import frappe.utils -import frappe.async import frappe.sessions import frappe.utils.file_manager import frappe.desk.form.run_method diff --git a/frappe/hooks.py b/frappe/hooks.py index 91c9be3af7..a0390663b5 100755 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -162,7 +162,7 @@ scheduler_events = { "frappe.desk.doctype.event.event.send_event_digest", "frappe.sessions.clear_expired_sessions", "frappe.email.doctype.notification.notification.trigger_daily_alerts", - "frappe.async.remove_old_task_logs", + "frappe.realtime.remove_old_task_logs", "frappe.utils.scheduler.disable_scheduler_on_expiry", "frappe.utils.scheduler.restrict_scheduler_events_if_dormant", "frappe.email.doctype.auto_email_report.auto_email_report.send_daily", diff --git a/frappe/async.py b/frappe/realtime.py similarity index 100% rename from frappe/async.py rename to frappe/realtime.py diff --git a/frappe/utils/background_jobs.py b/frappe/utils/background_jobs.py index 9f75b1b744..fc59c8dc7f 100755 --- a/frappe/utils/background_jobs.py +++ b/frappe/utils/background_jobs.py @@ -202,7 +202,7 @@ def get_queue(queue, is_async=True): '''Returns a Queue object tied to a redis connection''' validate_queue(queue) - return Queue(queue, connection=get_redis_conn(), async=is_async) + return Queue(queue, connection=get_redis_conn(), is_async=is_async) def validate_queue(queue, default_queue_list=None): if not default_queue_list: diff --git a/socketio.js b/socketio.js index 5fcbf46785..6e6a841acc 100644 --- a/socketio.js +++ b/socketio.js @@ -72,7 +72,7 @@ io.on('connection', function (socket) { }); // end frappe.chat - request.get(get_url(socket, '/api/method/frappe.async.get_user_info')) + request.get(get_url(socket, '/api/method/frappe.realtime.get_user_info')) .type('form') .query({ sid: sid @@ -291,7 +291,7 @@ function get_url(socket, path) { function can_subscribe_doc(args) { if (!args) return; if (!args.doctype || !args.docname) return; - request.get(get_url(args.socket, '/api/method/frappe.async.can_subscribe_doc')) + request.get(get_url(args.socket, '/api/method/frappe.realtime.can_subscribe_doc')) .type('form') .query({ sid: args.sid,