fix: 一键优化改后台线程去compact防掉线+说明+按钮变灰+进度显示 v1.3.5
This commit is contained in:
1 parent
ec38cd80e0
commit
bb7101af67
2 files changed
+48
-23
No files matched your search
@@ -1,5 +1,6 @@
|
||||
from flask import Flask, jsonify, request, send_from_directory
|
||||
import psutil, os, time, signal, threading, subprocess, platform, glob, json, struct
|
||||
import hashlib, random, urllib.request, urllib.parse
|
||||
try:
|
||||
psutil.PROCFS_PATH = os.environ.get("PROCFS_PATH", "/proc")
|
||||
except Exception:
|
||||
@@ -599,41 +600,63 @@ def api_cpu_advise():
|
||||
"level": level, "verdict": verdict, "tips": tips,
|
||||
"top_cpu": [{"name": t.get("name"), "cpu": t.get("cpu"), "pid": t.get("pid")} for t in tops]})
|
||||
|
||||
@app.route("/api/sys/optimize", methods=["POST"])
|
||||
def api_sys_optimize():
|
||||
"""一键优化系统: drop caches + sync + compact(若支持),返回前后对比"""
|
||||
_OPT_JOB = {"running": False, "done": False, "steps": [], "freed": 0,
|
||||
"available": 0, "started": 0}
|
||||
|
||||
def _optimize_worker():
|
||||
job = _OPT_JOB
|
||||
steps = []
|
||||
try:
|
||||
before_mem = psutil.virtual_memory().available
|
||||
except Exception:
|
||||
before_mem = 0
|
||||
try:
|
||||
subprocess.run(["sync"], check=False, timeout=15)
|
||||
steps.append("sync 数据落盘 ✅")
|
||||
subprocess.run(["sync"], check=False, timeout=20)
|
||||
steps.append("数据落盘(sync)完成")
|
||||
except Exception as e:
|
||||
steps.append("sync 失败: %s" % e)
|
||||
steps.append("数据落盘跳过: %s" % e)
|
||||
try:
|
||||
p = os.environ.get("PROCFS_PATH", "/proc")
|
||||
with open(os.path.join(p, "sys", "vm", "drop_caches"), "w") as f:
|
||||
f.write("3")
|
||||
steps.append("回收内存缓存 ✅")
|
||||
steps.append("内存缓存已回收(drop caches)")
|
||||
except Exception as e:
|
||||
steps.append("回收缓存失败: %s" % e)
|
||||
try:
|
||||
cp = os.path.join(os.environ.get("PROCFS_PATH", "/proc"), "sys", "vm", "compact_memory")
|
||||
if os.path.exists(cp):
|
||||
with open(cp, "w") as f:
|
||||
f.write("1")
|
||||
steps.append("内存碎片整理 ✅")
|
||||
except Exception as e:
|
||||
steps.append("碎片整理跳过: %s" % e)
|
||||
steps.append("缓存回收跳过: %s" % e)
|
||||
try:
|
||||
after_mem = psutil.virtual_memory().available
|
||||
except Exception:
|
||||
after_mem = 0
|
||||
return jsonify({"ok": True, "steps": steps,
|
||||
"freed": max(0, after_mem - before_mem),
|
||||
"available": after_mem})
|
||||
job["steps"] = steps
|
||||
job["freed"] = max(0, after_mem - before_mem)
|
||||
job["available"] = after_mem
|
||||
job["done"] = True
|
||||
job["running"] = False
|
||||
|
||||
@app.route("/api/sys/optimize", methods=["POST"])
|
||||
def api_sys_optimize():
|
||||
"""一键优化系统: 后台线程做 sync + drop caches,不阻塞监控轮询.
|
||||
已去掉 compact_memory(大内存下会卡住数分钟,正是之前掉线的原因)"""
|
||||
if _OPT_JOB.get("running"):
|
||||
return jsonify({"ok": False, "running": True,
|
||||
"msg": "优化正在进行中,请稍候"}), 409
|
||||
_OPT_JOB.update({"running": True, "done": False, "steps": [],
|
||||
"freed": 0, "available": 0, "started": time.time()})
|
||||
threading.Thread(target=_optimize_worker, daemon=True).start()
|
||||
return jsonify({"ok": True, "started": True, "eta": 20})
|
||||
|
||||
@app.route("/api/sys/optimize/status")
|
||||
def api_sys_optimize_status():
|
||||
job = _OPT_JOB
|
||||
try:
|
||||
elapsed = round(time.time() - job.get("started", 0), 1) if job.get("started") else 0
|
||||
except Exception:
|
||||
elapsed = 0
|
||||
return jsonify({"running": job.get("running", False),
|
||||
"done": job.get("done", False),
|
||||
"steps": job.get("steps", []),
|
||||
"freed": job.get("freed", 0),
|
||||
"available": job.get("available", 0),
|
||||
"elapsed": elapsed})
|
||||
|
||||
@app.route("/api/sensors")
|
||||
def api_sensors():
|
||||
@@ -1109,4 +1132,4 @@ def health():
|
||||
return jsonify({"ok": True})
|
||||
|
||||
if __name__ == "__main__":
|
||||
app.run(host="0.0.0.0", port=PORT)
|
||||
app.run(host="0.0.0.0", port=PORT, threaded=True)
|
||||
Reference in new issue
Block a user