diff --git a/app/__init__.py b/app/__init__.py index 96ece80..f8c7bbf 100644 --- a/app/__init__.py +++ b/app/__init__.py @@ -2,6 +2,7 @@ from flask import Flask, request from datetime import datetime import os import json +import logging from .route.route import route_bp @@ -10,6 +11,18 @@ def create_app(): app.register_blueprint(route_bp) + # 创建日志文件夹 + if not os.path.exists('/data/ww/py_sys_monitor/logs'): + os.makedirs('/data/ww/py_sys_monitor/logs') + + # 配置日志记录 + logging.basicConfig( + filename='/data/ww/py_sys_monitor/logs/all.log', + level=logging.INFO, + format='%(asctime)s %(levelname)s: %(message)s', + datefmt='%Y-%m-%d %H:%M:%S' + ) + log_file_path = '/data/ww/py_sys_monitor/info/access_log' def log_request_response(response): diff --git a/app/cpu_usage.py b/app/cpu_usage.py index ef95e57..13993a2 100644 --- a/app/cpu_usage.py +++ b/app/cpu_usage.py @@ -1,6 +1,7 @@ import psutil +import logging def get_cpu_percent(): cpu_percent = psutil.cpu_percent(interval=1) - print(f'CPU usage: {cpu_percent}%') + logging.info(f'CPU usage: {cpu_percent}%') return cpu_percent \ No newline at end of file diff --git a/app/io_usage.py b/app/io_usage.py index 93afa60..89b0fe5 100644 --- a/app/io_usage.py +++ b/app/io_usage.py @@ -1,6 +1,7 @@ import psutil +import logging def get_io_percent(): disk_usage = psutil.disk_usage('/') - print(f'Disk usage: {disk_usage.percent}%') + logging.info(f'Disk usage: {disk_usage.percent}%') return disk_usage.percent \ No newline at end of file diff --git a/app/memory_usage.py b/app/memory_usage.py index 073ca2b..c6482f8 100644 --- a/app/memory_usage.py +++ b/app/memory_usage.py @@ -1,6 +1,7 @@ import psutil +import logging def get_memory_percent(): virtual_memory = psutil.virtual_memory() - print(f'Memory usage: {virtual_memory.percent}%') + logging.info(f'Memory usage: {virtual_memory.percent}%') return virtual_memory.percent \ No newline at end of file diff --git a/app/route/route.py b/app/route/route.py index de3a6e0..923f339 100644 --- a/app/route/route.py +++ b/app/route/route.py @@ -12,7 +12,7 @@ import app.sys_clean as sys_clean route_bp = Blueprint('route', __name__) # 资源使用情况 -@route_bp.route('/sys/resource', methods=['GET']) +@route_bp.route('/api/sys/resource', methods=['GET']) def get_resource(): cpu_percent = cpu_usage.get_cpu_percent() io_percent = io_usage.get_io_percent() @@ -26,14 +26,14 @@ def get_resource(): }) # 获取过去12小时网络传输速度 -@route_bp.route('/sys/network_speed', methods=['GET']) +@route_bp.route('/api/sys/network_speed', methods=['GET']) def get_network(): return jsonify({"network_speed": network_usage.get_last_12_hours_speed()}) # 最近登录信息 -@route_bp.route('/sys/login_info', methods=['GET']) +@route_bp.route('/api/sys/login_info', methods=['GET']) def get_login_info(): page_index = int(request.args.get('page_index', 1)) page_size = int(request.args.get('page_size', 10)) @@ -41,7 +41,7 @@ def get_login_info(): return jsonify(data) # 请求信息 -@route_bp.route('/sys/request_info', methods=['GET']) +@route_bp.route('/api/sys/request_info', methods=['GET']) def get_request_info(): page_index = int(request.args.get('page_index', 1)) page_size = int(request.args.get('page_size', 10)) @@ -49,35 +49,35 @@ def get_request_info(): return jsonify(data) # 病毒列表 -@route_bp.route('/sys/virus_get', methods=['GET']) +@route_bp.route('/api/sys/virus_get', methods=['GET']) def get_virus(): return imitate_thread.get_virus_queue_data() # 清理病毒 -@route_bp.route('/sys/virus_clean', methods=['POST']) +@route_bp.route('/api/sys/virus_clean', methods=['POST']) def delete_virus(): names_list = request.json.get('names_list', []) return imitate_thread.delete_virus_queue_data(names_list) # 漏洞列表 -@route_bp.route('/sys/bugs_get', methods=['GET']) +@route_bp.route('/api/sys/bugs_get', methods=['GET']) def get_bugs(): return imitate_thread.get_bugs_queue_data() # 清理漏洞 -@route_bp.route('/sys/bugs_clean', methods=['POST']) +@route_bp.route('/api/sys/bugs_clean', methods=['POST']) def delete_bugs(): names_list = request.json.get('names_list', []) return imitate_thread.delete_bugs_queue_data(names_list) # 垃圾文件数量 -@route_bp.route('/sys/junk_files', methods=['GET']) +@route_bp.route('/api/sys/junk_files', methods=['GET']) def get_junk_file(): return sys_clean.get_junk_file() # 清理垃圾文件 -@route_bp.route('/sys/clean_junk', methods=['POST']) +@route_bp.route('/api/sys/clean_junk', methods=['POST']) def clean_junk_file(): filenames = request.json.get('file_list', []) return sys_clean.clean_junk_file(filenames) \ No newline at end of file diff --git a/app/sys_clean.py b/app/sys_clean.py index 4986228..d18b411 100644 --- a/app/sys_clean.py +++ b/app/sys_clean.py @@ -1,5 +1,6 @@ import os -from flask import jsonify, request +from flask import jsonify +import logging log_directory = '/data/ww/bridge/logs' @@ -24,6 +25,6 @@ def clean_junk_file(filenames): os.remove(file_path) deleted_count += 1 except Exception as e: - print(f'Failed to delete {file_path}. Reason: {e}') + logging.info(f'Failed to delete {file_path}. Reason: {e}') return jsonify({"message": "Files deleted successfully", "deleted_count": deleted_count}) \ No newline at end of file