diff --git a/plugins/clean/index.html b/plugins/clean/index.html
index 220f281b4..86fe332a0 100755
--- a/plugins/clean/index.html
+++ b/plugins/clean/index.html
@@ -17,7 +17,7 @@ pluginService('clean');
function pRead(){
var readme = '
';
- readme += '- 启动后,加入到计划中[2:30]执行。
';
+ readme += '- 启动后,加入到计划任务每隔3天[0:15]执行。
';
readme += '- 【*】代表要删除。
';
readme += '- 添加/删除清除日志,可在`配置修改`中添加/删除。
';
readme += '- 如果是目录,会寻找【.log】后缀的文件清空。
';
diff --git a/plugins/clean/index.py b/plugins/clean/index.py
index 91c1e57ee..b42abdac1 100755
--- a/plugins/clean/index.py
+++ b/plugins/clean/index.py
@@ -99,7 +99,26 @@ def initConf():
"/var/log/secure",
"/var/log/lastlog",
"/var/log/cron",
- "/www/server/cron"
+ "/www/server/rsyncd",
+ "/www/server/sphinx/index",
+ "/www/server/mongodb/logs",
+ "/www/server/php/53/var/log",
+ "/www/server/php/54/var/log",
+ "/www/server/php/55/var/log",
+ "/www/server/php/56/var/log",
+ "/www/server/php/70/var/log",
+ "/www/server/php/71/var/log",
+ "/www/server/php/72/var/log",
+ "/www/server/php/73/var/log",
+ "/www/server/php/74/var/log",
+ "/www/server/php/80/var/log",
+ "/www/server/php/81/var/log",
+ "/www/server/php/82/var/log",
+ "/www/server/php/83/var/log",
+ "/www/server/php/84/var/log",
+ "/www/server/phpmyadmin",
+ "/www/server/redis/data",
+ "/www/server/cron",
]
for i in clogcom:
if os.path.exists(i):
diff --git a/plugins/clean/tool_task.py b/plugins/clean/tool_task.py
index d61b4f41f..fe2d90db0 100644
--- a/plugins/clean/tool_task.py
+++ b/plugins/clean/tool_task.py
@@ -37,57 +37,36 @@ def getConfigData():
return json.loads(mw.readFile(getTaskConf()))
except:
pass
- return []
-
-
-def getConfigTpl():
- tpl = {
- "name": "",
+ return {
"task_id": -1,
+ "period": "day-n",
+ "where1": "3",
+ "hour": "0",
+ "minute": "15",
}
- return tpl
def createBgTask():
removeBgTask()
- args = {
- "period": "day",
- "hour": "0",
- "minute": "15",
- }
- createBgTaskByName(getPluginName(), args)
+ createBgTaskByName(getPluginName())
-def createBgTaskByName(name, args):
- cfg = getConfigTpl()
+def createBgTaskByName(name):
+ args = getConfigData()
_name = "[勿删]日志清理[" + name + "]"
res = mw.M("crontab").field("id, name").where("name=?", (_name,)).find()
if res:
return True
- if "task_id" in cfg.keys() and cfg["task_id"] > 0:
+ if "task_id" in args and args["task_id"] > 0:
res = mw.M("crontab").field("id, name").where(
- "id=?", (cfg["task_id"],)).find()
- if res and res["id"] == cfg["task_id"]:
+ "id=?", (args["task_id"],)).find()
+ if res and res["id"] == args["task_id"]:
print("计划任务已经存在!")
return True
import crontab_api
api = crontab_api.crontab_api()
- period = args['period']
- _hour = ''
- _minute = ''
- _where1 = ''
- _type_day = "day"
- if period == 'day':
- _type_day = 'day'
- _hour = args['hour']
- _minute = args['minute']
- elif period == 'minute-n':
- _type_day = 'minute-n'
- _where1 = args['minute-n']
- _minute = ''
-
mw_dir = mw.getRunDir()
cmd = '''
mw_dir=%s
@@ -105,11 +84,11 @@ logs_file=$plugin_path/${rname}.log
params = {
'name': _name,
- 'type': _type_day,
+ 'type': args['period'],
'week': "",
- 'where1': _where1,
- 'hour': _hour,
- 'minute': _minute,
+ 'where1': args['where1'],
+ 'hour': args['hour'],
+ 'minute': args['minute'],
'save': "",
'backup_to': "",
'stype': "toShell",
@@ -120,30 +99,24 @@ logs_file=$plugin_path/${rname}.log
task_id = api.add(params)
if task_id > 0:
- cfg["task_id"] = task_id
- cfg["name"] = name
-
- _dd = getConfigData()
- _dd.append(cfg)
- mw.writeFile(getTaskConf(), json.dumps(_dd))
+ args["task_id"] = task_id
+ args["name"] = name
+ mw.writeFile(getTaskConf(), json.dumps(args))
def removeBgTask():
- cfg_list = getConfigData()
- for x in range(len(cfg_list)):
- cfg = cfg_list[x]
- if "task_id" in cfg.keys() and cfg["task_id"] > 0:
- res = mw.M("crontab").field("id, name").where(
- "id=?", (cfg["task_id"],)).find()
- if res and res["id"] == cfg["task_id"]:
- import crontab_api
- api = crontab_api.crontab_api()
- data = api.delete(cfg["task_id"])
- if data[0]:
- cfg["task_id"] = -1
- cfg_list[x] = cfg
- mw.writeFile(getTaskConf(), '[]')
- return True
+ cfg = getConfigData()
+ if "task_id" in cfg and cfg["task_id"] > 0:
+ res = mw.M("crontab").field("id, name").where(
+ "id=?", (cfg["task_id"],)).find()
+ if res and res["id"] == cfg["task_id"]:
+ import crontab_api
+ api = crontab_api.crontab_api()
+ data = api.delete(cfg["task_id"])
+ if data[0]:
+ cfg["task_id"] = -1
+ mw.writeFile(getTaskConf(), json.loads(cfg))
+ return True
return False