From 393696fa4aef2e64dd0ff7c5fe1ac2d7b6a973f6 Mon Sep 17 00:00:00 2001 From: Gavin D'souza Date: Thu, 6 May 2021 19:22:31 +0530 Subject: [PATCH] chore: Drop dead code * Don't create task-logs folder during site creation * Remove old unused async code for tracking tasks --- frappe/hooks.py | 1 - frappe/installer.py | 1 - frappe/realtime.py | 82 +++------------------------------------------ 3 files changed, 4 insertions(+), 80 deletions(-) diff --git a/frappe/hooks.py b/frappe/hooks.py index 1c78d47755..b999d2cd95 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -226,7 +226,6 @@ scheduler_events = { "frappe.desk.doctype.event.event.send_event_digest", "frappe.sessions.clear_expired_sessions", "frappe.email.doctype.notification.notification.trigger_daily_alerts", - "frappe.realtime.remove_old_task_logs", "frappe.utils.scheduler.restrict_scheduler_events_if_dormant", "frappe.email.doctype.auto_email_report.auto_email_report.send_daily", "frappe.website.doctype.personal_data_deletion_request.personal_data_deletion_request.remove_unverified_record", diff --git a/frappe/installer.py b/frappe/installer.py index 0cd5b136ae..e3fd66228d 100755 --- a/frappe/installer.py +++ b/frappe/installer.py @@ -397,7 +397,6 @@ def make_site_dirs(): os.path.join(site_public_path, 'files'), os.path.join(site_private_path, 'files'), os.path.join(frappe.local.site_path, 'logs'), - os.path.join(frappe.local.site_path, 'task-logs')): if not os.path.exists(dir_path): os.makedirs(dir_path) locks_dir = frappe.get_site_path('locks') diff --git a/frappe/realtime.py b/frappe/realtime.py index f546703e58..6c812e8868 100644 --- a/frappe/realtime.py +++ b/frappe/realtime.py @@ -1,56 +1,23 @@ -# -*- coding: utf-8 -*- # Copyright (c) 2015, Frappe Technologies Pvt. Ltd. and contributors # For license information, please see license.txt -from __future__ import unicode_literals - - import frappe import os -import time import redis -from io import FileIO -from frappe.utils import get_site_path -from frappe import conf -END_LINE = '' -TASK_LOG_MAX_AGE = 86400 # 1 day in seconds redis_server = None + @frappe.whitelist() def get_pending_tasks_for_doc(doctype, docname): return frappe.db.sql_list("select name from `tabAsync Task` where status in ('Queued', 'Running') and reference_doctype=%s and reference_name=%s", (doctype, docname)) -def set_task_status(task_id, status, response=None): - if not response: - response = {} - response.update({ - "status": status, - "task_id": task_id - }) - emit_via_redis("task_status_change", response, room="task:" + task_id) - - -def remove_old_task_logs(): - logs_path = get_site_path('task-logs') - - def full_path(_file): - return os.path.join(logs_path, _file) - - files_to_remove = [full_path(_file) for _file in os.listdir(logs_path)] - files_to_remove = [_file for _file in files_to_remove if is_file_old(_file) and os.path.isfile(_file)] - for _file in files_to_remove: - os.remove(_file) - - -def is_file_old(file_path): - return ((time.time() - os.stat(file_path).st_mtime) > TASK_LOG_MAX_AGE) - def publish_progress(percent, title=None, doctype=None, docname=None, description=None): publish_realtime('progress', {'percent': percent, 'title': title, 'description': description}, user=frappe.session.user, doctype=doctype, docname=docname) + def publish_realtime(event=None, message=None, room=None, user=None, doctype=None, docname=None, task_id=None, after_commit=False): @@ -103,6 +70,7 @@ def publish_realtime(event=None, message=None, room=None, else: emit_via_redis(event, message, room) + def emit_via_redis(event, message, room): """Publish real-time updates via redis @@ -117,57 +85,17 @@ def emit_via_redis(event, message, room): # print(frappe.get_traceback()) pass -def put_log(line_no, line, task_id=None): - r = get_redis_server() - if not task_id: - task_id = frappe.local.task_id - task_progress_room = get_task_progress_room(task_id) - task_log_key = "task_log:" + task_id - publish_realtime('task_progress', { - "message": { - "lines": {line_no: line} - }, - "task_id": task_id - }, room=task_progress_room) - r.hset(task_log_key, line_no, line) - r.expire(task_log_key, 3600) - def get_redis_server(): """returns redis_socketio connection.""" global redis_server if not redis_server: from redis import Redis - redis_server = Redis.from_url(conf.get("redis_socketio") + redis_server = Redis.from_url(frappe.conf.redis_socketio or "redis://localhost:12311") return redis_server -class FileAndRedisStream(FileIO): - def __init__(self, *args, **kwargs): - ret = super(FileAndRedisStream, self).__init__(*args, **kwargs) - self.count = 0 - return ret - - def write(self, data): - ret = super(FileAndRedisStream, self).write(data) - if frappe.local.task_id: - put_log(self.count, data, task_id=frappe.local.task_id) - self.count += 1 - return ret - - -def get_std_streams(task_id): - stdout = FileAndRedisStream(get_task_log_file_path(task_id, 'stdout'), 'w') - # stderr = FileAndRedisStream(get_task_log_file_path(task_id, 'stderr'), 'w') - return stdout, stdout - - -def get_task_log_file_path(task_id, stream_type): - logs_dir = frappe.utils.get_site_path('task-logs') - return os.path.join(logs_dir, task_id + '.' + stream_type) - - @frappe.whitelist(allow_guest=True) def can_subscribe_doc(doctype, docname): if os.environ.get('CI'): @@ -201,9 +129,7 @@ def get_site_room(): def get_task_progress_room(task_id): return "".join([frappe.local.site, ":task_progress:", task_id]) -# frappe.chat def get_chat_room(room): room = ''.join([frappe.local.site, ":room:", room]) return room -# end frappe.chat room \ No newline at end of file