mirror of
https://github.com/aaPanel/aaPanel.git
synced 2026-08-17 21:25:47 +02:00
v6.8.12
1. Add disk IO information to the homepage 2. Add a clear list button in the upload window 3. Optimize the background task overhead of the panel 4. Optimize the disk information caching mechanism 5. Panel Pro edition is online 6. Optimize panel resource usage 7. Optimize SSL certificate renewal 8. Fix the problem of reporting an error when the security entrance is empty 9. Fix the problem of infinite recursion when copying directories in extreme cases
This commit is contained in:
jose
@@ -8,75 +8,86 @@
|
||||
# | Author: hwliang <hwl@bt.cn>
|
||||
# +-------------------------------------------------------------------
|
||||
|
||||
#------------------------------
|
||||
# ------------------------------
|
||||
# 计划任务
|
||||
#------------------------------
|
||||
# ------------------------------
|
||||
|
||||
import sys
|
||||
import os
|
||||
import logging
|
||||
from json import dumps,loads
|
||||
from psutil import Process,pids,cpu_count,cpu_percent,net_io_counters,disk_io_counters,virtual_memory
|
||||
sys.path.insert(0,"/www/server/panel/class/")
|
||||
import db
|
||||
import public
|
||||
from json import dumps, loads
|
||||
from psutil import Process, pids, cpu_count, cpu_percent, net_io_counters, disk_io_counters, virtual_memory
|
||||
os.environ['BT_TASK'] = '1'
|
||||
base_path = "/www/server/panel"
|
||||
sys.path.insert(0, "/www/server/panel/class/")
|
||||
import time
|
||||
import panelTask
|
||||
global pre,timeoutCount,logPath,isTask,oldEdate,isCheck
|
||||
import public
|
||||
import db
|
||||
global pre, timeoutCount, logPath, isTask, oldEdate, isCheck
|
||||
pre = 0
|
||||
timeoutCount = 0
|
||||
isCheck = 0
|
||||
oldEdate = None
|
||||
logPath = '/tmp/panelExec.log'
|
||||
isTask = '/tmp/panelTask.pl'
|
||||
python_bin = None
|
||||
|
||||
def get_python_bin():
|
||||
global python_bin
|
||||
if python_bin: return python_bin
|
||||
bin_file = '/www/server/panel/pyenv/bin/python'
|
||||
bin_file2 = '/usr/bin/python'
|
||||
if os.path.exists(bin_file):
|
||||
python_bin = bin_file
|
||||
return bin_file
|
||||
return '/usr/bin/python'
|
||||
python_bin = bin_file2
|
||||
return bin_file2
|
||||
|
||||
def ReadFile(filename,mode = 'r'):
|
||||
|
||||
def ReadFile(filename, mode='r'):
|
||||
"""
|
||||
读取文件内容
|
||||
@filename 文件名
|
||||
return string(bin) 若文件不存在，则返回None
|
||||
"""
|
||||
if not os.path.exists(filename): return False
|
||||
if not os.path.exists(filename):
|
||||
return False
|
||||
f_body = None
|
||||
with open(filename, mode) as fp:
|
||||
f_body = fp.read()
|
||||
return f_body
|
||||
|
||||
#下载文件
|
||||
def DownloadFile(url,filename):
|
||||
# 下载文件
|
||||
def DownloadFile(url, filename):
|
||||
try:
|
||||
import urllib,socket
|
||||
import urllib
|
||||
import socket
|
||||
socket.setdefaulttimeout(10)
|
||||
urllib.urlretrieve(url,filename=filename ,reporthook= DownloadHook)
|
||||
urllib.urlretrieve(url, filename=filename, reporthook=DownloadHook)
|
||||
os.system('chown www.www ' + filename)
|
||||
WriteLogs('done')
|
||||
except:
|
||||
WriteLogs('done')
|
||||
|
||||
|
||||
|
||||
#下载文件进度回调
|
||||
# 下载文件进度回调
|
||||
def DownloadHook(count, blockSize, totalSize):
|
||||
global pre
|
||||
used = count * blockSize
|
||||
pre1 = int((100.0 * used / totalSize))
|
||||
if pre == pre1:
|
||||
return
|
||||
speed = {'total':totalSize,'used':used,'pre':pre}
|
||||
speed = {'total': totalSize, 'used': used, 'pre': pre}
|
||||
WriteLogs(dumps(speed))
|
||||
pre = pre1
|
||||
|
||||
#写输出日志
|
||||
# 写输出日志
|
||||
|
||||
|
||||
def WriteLogs(logMsg):
|
||||
try:
|
||||
global logPath
|
||||
with open(logPath,'w+') as fp:
|
||||
with open(logPath, 'w+') as fp:
|
||||
fp.write(logMsg)
|
||||
fp.close()
|
||||
except:
|
||||
@@ -90,7 +101,8 @@ def ExecShell(cmdstring, cwd=None, timeout=None, shell=True):
|
||||
import datetime
|
||||
import subprocess
|
||||
import time
|
||||
sub = subprocess.Popen(cmdstring+' &> '+logPath, cwd=cwd, stdin=subprocess.PIPE,shell=shell,bufsize=4096)
|
||||
sub = subprocess.Popen(cmdstring+' &> '+logPath, cwd=cwd,
|
||||
stdin=subprocess.PIPE, shell=shell, bufsize=4096)
|
||||
|
||||
while sub.poll() is None:
|
||||
time.sleep(0.1)
|
||||
@@ -100,7 +112,7 @@ def ExecShell(cmdstring, cwd=None, timeout=None, shell=True):
|
||||
return None
|
||||
|
||||
|
||||
#任务队列
|
||||
# 任务队列
|
||||
def startTask():
|
||||
global isTask
|
||||
try:
|
||||
@@ -108,21 +120,27 @@ def startTask():
|
||||
try:
|
||||
if os.path.exists(isTask):
|
||||
with db.Sql() as sql:
|
||||
sql.table('tasks').where("status=?",('-1',)).setField('status','0')
|
||||
taskArr = sql.table('tasks').where("status=?",('0',)).field('id,type,execstr').order("id asc").select()
|
||||
sql.table('tasks').where(
|
||||
"status=?", ('-1',)).setField('status', '0')
|
||||
taskArr = sql.table('tasks').where("status=?", ('0',)).field(
|
||||
'id,type,execstr').order("id asc").select()
|
||||
for value in taskArr:
|
||||
start = int(time.time())
|
||||
if not sql.table('tasks').where("id=?",(value['id'],)).count(): continue
|
||||
sql.table('tasks').where("id=?",(value['id'],)).save('status,start',('-1',start))
|
||||
if not sql.table('tasks').where("id=?", (value['id'],)).count():
|
||||
continue
|
||||
sql.table('tasks').where("id=?", (value['id'],)).save(
|
||||
'status,start', ('-1', start))
|
||||
if value['type'] == 'download':
|
||||
argv = value['execstr'].split('|bt|')
|
||||
DownloadFile(argv[0],argv[1])
|
||||
DownloadFile(argv[0], argv[1])
|
||||
elif value['type'] == 'execshell':
|
||||
ExecShell(value['execstr'])
|
||||
end = int(time.time())
|
||||
sql.table('tasks').where("id=?",(value['id'],)).save('status,end',('1',end))
|
||||
if(sql.table('tasks').where("status=?",('0')).count() < 1):
|
||||
if os.path.exists(isTask): os.remove(isTask)
|
||||
sql.table('tasks').where("id=?", (value['id'],)).save(
|
||||
'status,end', ('1', end))
|
||||
if(sql.table('tasks').where("status=?", ('0')).count() < 1):
|
||||
if os.path.exists(isTask):
|
||||
os.remove(isTask)
|
||||
#ExecShell('rm -f ' + isTask)
|
||||
sql.close()
|
||||
taskArr = None
|
||||
@@ -131,23 +149,26 @@ def startTask():
|
||||
siteEdate()
|
||||
time.sleep(2)
|
||||
except Exception as ex:
|
||||
logging.debug(ex)
|
||||
logging.info(ex)
|
||||
time.sleep(60)
|
||||
startTask()
|
||||
|
||||
#网站到期处理
|
||||
|
||||
# 网站到期处理
|
||||
|
||||
|
||||
def siteEdate():
|
||||
global oldEdate
|
||||
try:
|
||||
if not oldEdate: oldEdate = ReadFile('data/edate.pl')
|
||||
if not oldEdate: oldEdate = ReadFile('{}/data/edate.pl'.format(base_path))
|
||||
if not oldEdate: oldEdate = '0000-00-00'
|
||||
mEdate = time.strftime('%Y-%m-%d',time.localtime())
|
||||
mEdate = time.strftime('%Y-%m-%d', time.localtime())
|
||||
if oldEdate == mEdate: return False
|
||||
os.system(get_python_bin() + " /www/server/panel/script/site_task.py > /dev/null")
|
||||
os.system(get_python_bin() + " {}/script/site_task.py > /dev/null".format(base_path))
|
||||
except Exception as ex:
|
||||
logging.debug(ex)
|
||||
logging.info(ex)
|
||||
pass
|
||||
|
||||
|
||||
def GetLoadAverage():
|
||||
c = os.getloadavg()
|
||||
data = {}
|
||||
@@ -158,12 +179,12 @@ def GetLoadAverage():
|
||||
data['limit'] = data['max']
|
||||
data['safe'] = data['max'] * 0.75
|
||||
return data
|
||||
|
||||
|
||||
#系统监控任务
|
||||
|
||||
# 系统监控任务
|
||||
def systemTask():
|
||||
try:
|
||||
filename = 'data/control.conf'
|
||||
filename = '{}/data/control.conf'.format(base_path)
|
||||
with db.Sql() as sql:
|
||||
sql = sql.dbfile('system')
|
||||
csql = '''CREATE TABLE IF NOT EXISTS `load_average` (
|
||||
@@ -174,17 +195,19 @@ def systemTask():
|
||||
`fifteen` REAL,
|
||||
`addtime` INTEGER
|
||||
)'''
|
||||
sql.execute(csql,())
|
||||
sql.execute(csql, ())
|
||||
sql.close()
|
||||
|
||||
count = 0
|
||||
reloadNum=0
|
||||
network_up = network_down = diskio_1 = diskio_2 = networkInfo = cpuInfo = diskInfo = None
|
||||
diskio_1 = diskio_2 = networkInfo = cpuInfo = diskInfo = None
|
||||
network_up = {}
|
||||
network_down = {}
|
||||
while True:
|
||||
if not os.path.exists(filename):
|
||||
time.sleep(10)
|
||||
continue
|
||||
|
||||
|
||||
day = 30
|
||||
try:
|
||||
day = int(ReadFile(filename))
|
||||
@@ -192,97 +215,108 @@ def systemTask():
|
||||
time.sleep(10)
|
||||
continue
|
||||
except:
|
||||
day = 30
|
||||
|
||||
|
||||
day = 30
|
||||
|
||||
tmp = {}
|
||||
#取当前CPU Io
|
||||
# 取当前CPU Io
|
||||
tmp['used'] = cpu_percent(interval=1)
|
||||
|
||||
|
||||
if not cpuInfo:
|
||||
tmp['mem'] = GetMemUsed()
|
||||
cpuInfo = tmp
|
||||
|
||||
cpuInfo = tmp
|
||||
|
||||
if cpuInfo['used'] < tmp['used']:
|
||||
tmp['mem'] = GetMemUsed()
|
||||
cpuInfo = tmp
|
||||
|
||||
|
||||
|
||||
#取当前网络Io
|
||||
networkIo = net_io_counters()[:4]
|
||||
if not network_up:
|
||||
network_up = networkIo[0]
|
||||
network_down = networkIo[1]
|
||||
cpuInfo = tmp
|
||||
|
||||
# 取当前网络Io
|
||||
networkIo_list = net_io_counters(pernic=True)
|
||||
tmp = {}
|
||||
tmp['upTotal'] = networkIo[0]
|
||||
tmp['downTotal'] = networkIo[1]
|
||||
tmp['up'] = round(float((networkIo[0] - network_up) / 1024),2)
|
||||
tmp['down'] = round(float((networkIo[1] - network_down) / 1024),2)
|
||||
tmp['downPackets'] = networkIo[3]
|
||||
tmp['upPackets'] = networkIo[2]
|
||||
|
||||
network_up = networkIo[0]
|
||||
network_down = networkIo[1]
|
||||
|
||||
if not networkInfo: networkInfo = tmp
|
||||
if (tmp['up'] + tmp['down']) > (networkInfo['up'] + networkInfo['down']): networkInfo = tmp
|
||||
|
||||
#取磁盘Io
|
||||
tmp['upTotal'] = 0
|
||||
tmp['downTotal'] = 0
|
||||
tmp['up'] = 0
|
||||
tmp['down'] = 0
|
||||
tmp['downPackets'] = {}
|
||||
tmp['upPackets'] = {}
|
||||
|
||||
for k in networkIo_list.keys():
|
||||
networkIo = networkIo_list[k][:4]
|
||||
if not k in network_up.keys():
|
||||
network_up[k] = networkIo[0]
|
||||
network_down[k] = networkIo[1]
|
||||
|
||||
tmp['upTotal'] += networkIo[0]
|
||||
tmp['downTotal'] += networkIo[1]
|
||||
tmp['downPackets'][k] = round(
|
||||
float((networkIo[1] - network_down[k]) / 1024)/5, 2)
|
||||
tmp['upPackets'][k] = round(
|
||||
float((networkIo[0] - network_up[k]) / 1024)/5, 2)
|
||||
tmp['up'] += tmp['upPackets'][k]
|
||||
tmp['down'] += tmp['downPackets'][k]
|
||||
|
||||
network_up[k] = networkIo[0]
|
||||
network_down[k] = networkIo[1]
|
||||
|
||||
if not networkInfo:
|
||||
networkInfo = tmp
|
||||
if (tmp['up'] + tmp['down']) > (networkInfo['up'] + networkInfo['down']):
|
||||
networkInfo = tmp
|
||||
|
||||
# 取磁盘Io
|
||||
disk_ios = True
|
||||
try:
|
||||
if os.path.exists('/proc/diskstats'):
|
||||
diskio_2 = disk_io_counters()
|
||||
if not diskio_1: diskio_1 = diskio_2
|
||||
if not diskio_1:
|
||||
diskio_1 = diskio_2
|
||||
tmp = {}
|
||||
tmp['read_count'] = diskio_2.read_count - diskio_1.read_count
|
||||
tmp['write_count'] = diskio_2.write_count - diskio_1.write_count
|
||||
tmp['read_bytes'] = diskio_2.read_bytes - diskio_1.read_bytes
|
||||
tmp['write_bytes'] = diskio_2.write_bytes - diskio_1.write_bytes
|
||||
tmp['read_time'] = diskio_2.read_time - diskio_1.read_time
|
||||
tmp['write_time'] = diskio_2.write_time - diskio_1.write_time
|
||||
|
||||
if not diskInfo:
|
||||
tmp['read_count'] = diskio_2.read_count - diskio_1.read_count
|
||||
tmp['write_count'] = diskio_2.write_count - diskio_1.write_count
|
||||
tmp['read_bytes'] = diskio_2.read_bytes - diskio_1.read_bytes
|
||||
tmp['write_bytes'] = diskio_2.write_bytes - diskio_1.write_bytes
|
||||
tmp['read_time'] = diskio_2.read_time - diskio_1.read_time
|
||||
tmp['write_time'] = diskio_2.write_time - diskio_1.write_time
|
||||
|
||||
if not diskInfo:
|
||||
diskInfo = tmp
|
||||
else:
|
||||
diskInfo['read_count'] += tmp['read_count']
|
||||
diskInfo['write_count'] += tmp['write_count']
|
||||
diskInfo['read_bytes'] += tmp['read_bytes']
|
||||
diskInfo['write_bytes'] += tmp['write_bytes']
|
||||
diskInfo['read_time'] += tmp['read_time']
|
||||
diskInfo['write_time'] += tmp['write_time']
|
||||
|
||||
diskInfo['read_count'] += tmp['read_count']
|
||||
diskInfo['write_count'] += tmp['write_count']
|
||||
diskInfo['read_bytes'] += tmp['read_bytes']
|
||||
diskInfo['write_bytes'] += tmp['write_bytes']
|
||||
diskInfo['read_time'] += tmp['read_time']
|
||||
diskInfo['write_time'] += tmp['write_time']
|
||||
|
||||
diskio_1 = diskio_2
|
||||
except:
|
||||
logging.info(public.get_error_info())
|
||||
disk_ios = False
|
||||
|
||||
|
||||
#print diskInfo
|
||||
|
||||
# print diskInfo
|
||||
|
||||
if count >= 12:
|
||||
try:
|
||||
sql = db.Sql().dbfile('system')
|
||||
addtime = int(time.time())
|
||||
deltime = addtime - (day * 86400)
|
||||
|
||||
|
||||
data = (cpuInfo['used'],cpuInfo['mem'],addtime)
|
||||
sql.table('cpuio').add('pro,mem,addtime',data)
|
||||
sql.table('cpuio').where("addtime<?",(deltime,)).delete()
|
||||
|
||||
data = (networkInfo['up'] / 5,networkInfo['down'] / 5,networkInfo['upTotal'],networkInfo['downTotal'],networkInfo['downPackets'],networkInfo['upPackets'],addtime)
|
||||
data = (networkInfo['up'],networkInfo['down'],networkInfo['upTotal'],networkInfo['downTotal'],dumps(networkInfo['downPackets']),dumps(networkInfo['upPackets']),addtime)
|
||||
sql.table('network').add('up,down,total_up,total_down,down_packets,up_packets,addtime',data)
|
||||
sql.table('network').where("addtime<?",(deltime,)).delete()
|
||||
if os.path.exists('/proc/diskstats') and disk_ios:
|
||||
data = (diskInfo['read_count'],diskInfo['write_count'],diskInfo['read_bytes'],diskInfo['write_bytes'],diskInfo['read_time'],diskInfo['write_time'],addtime)
|
||||
sql.table('diskio').add('read_count,write_count,read_bytes,write_bytes,read_time,write_time,addtime',data)
|
||||
sql.table('diskio').where("addtime<?",(deltime,)).delete()
|
||||
|
||||
|
||||
#LoadAverage
|
||||
load_average = GetLoadAverage()
|
||||
lpro = round((load_average['one'] / load_average['max']) * 100,2)
|
||||
lpro = round((load_average['one'] / load_average['max']) * 100, 2)
|
||||
if lpro > 100: lpro = 100
|
||||
sql.table('load_average').add('pro,one,five,fifteen,addtime',(lpro,load_average['one'],load_average['five'],load_average['fifteen'],addtime))
|
||||
sql.table('load_average').add('pro,one,five,fifteen,addtime', (
|
||||
lpro, load_average['one'], load_average['five'], load_average['fifteen'], addtime))
|
||||
sql.close()
|
||||
|
||||
lpro = None
|
||||
@@ -296,125 +330,149 @@ def systemTask():
|
||||
if reloadNum > 1440:
|
||||
reloadNum = 0
|
||||
except Exception as ex:
|
||||
logging.debug(str(ex))
|
||||
logging.info(str(ex))
|
||||
del(tmp)
|
||||
|
||||
time.sleep(5)
|
||||
count +=1
|
||||
count += 1
|
||||
except Exception as ex:
|
||||
logging.debug(ex)
|
||||
logging.info(ex)
|
||||
time.sleep(30)
|
||||
systemTask()
|
||||
|
||||
|
||||
#取内存使用率
|
||||
|
||||
# 取内存使用率
|
||||
def GetMemUsed():
|
||||
try:
|
||||
mem = virtual_memory()
|
||||
memInfo = {'memTotal':mem.total/1024/1024,'memFree':mem.free/1024/1024,'memBuffers':mem.buffers/1024/1024,'memCached':mem.cached/1024/1024}
|
||||
memInfo = {'memTotal': mem.total / 1024 / 1024, 'memFree': mem.free / 1024 / 1024,
|
||||
'memBuffers': mem.buffers / 1024 / 1024, 'memCached': mem.cached / 1024 / 1024}
|
||||
tmp = memInfo['memTotal'] - memInfo['memFree'] - memInfo['memBuffers'] - memInfo['memCached']
|
||||
tmp1 = memInfo['memTotal'] / 100
|
||||
return (tmp / tmp1)
|
||||
except:
|
||||
return 1
|
||||
|
||||
#检查502错误
|
||||
# 检查502错误
|
||||
|
||||
|
||||
def check502():
|
||||
try:
|
||||
phpversions = ['53','54','55','56','70','71','72','73','74','80']
|
||||
phpversions = ['53', '54', '55', '56','70', '71', '72', '73', '74', '80']
|
||||
for version in phpversions:
|
||||
php_path = '/www/server/php/' + version + '/sbin/php-fpm'
|
||||
if not os.path.exists(php_path): continue
|
||||
if checkPHPVersion(version): continue
|
||||
if not os.path.exists(php_path):
|
||||
continue
|
||||
if checkPHPVersion(version):
|
||||
continue
|
||||
if startPHPVersion(version):
|
||||
public.WriteLog('PHP daemon','PHP-' + version + 'processing exception was detected and has been automatically fixed!',not_web = True)
|
||||
public.WriteLog('PHP daemon',
|
||||
'PHP-' + version + 'processing exception was detected and has been automatically fixed!',
|
||||
not_web=True)
|
||||
except Exception as ex:
|
||||
logging.info(ex)
|
||||
|
||||
#处理指定PHP版本
|
||||
|
||||
# 处理指定PHP版本
|
||||
|
||||
|
||||
def startPHPVersion(version):
|
||||
try:
|
||||
fpm = '/etc/init.d/php-fpm-'+version
|
||||
fpm = '/etc/init.d/php-fpm-' + version
|
||||
php_path = '/www/server/php/' + version + '/sbin/php-fpm'
|
||||
if not os.path.exists(php_path):
|
||||
if not os.path.exists(php_path):
|
||||
if os.path.exists(fpm): os.remove(fpm)
|
||||
return False
|
||||
|
||||
#尝试重载服务
|
||||
|
||||
# 尝试重载服务
|
||||
os.system(fpm + ' start')
|
||||
os.system(fpm + ' reload')
|
||||
if checkPHPVersion(version): return True
|
||||
|
||||
#尝试重启服务
|
||||
cgi = '/tmp/php-cgi-'+version + '.sock'
|
||||
pid = '/www/server/php/'+version+'/var/run/php-fpm.pid'
|
||||
os.system('pkill -9 php-fpm-'+version)
|
||||
|
||||
# 尝试重启服务
|
||||
cgi = '/tmp/php-cgi-' + version + '.sock'
|
||||
pid = '/www/server/php/' + version + '/var/run/php-fpm.pid'
|
||||
os.system('pkill -9 php-fpm-' + version)
|
||||
time.sleep(0.5)
|
||||
if not os.path.exists(cgi): os.system('rm -f ' + cgi)
|
||||
if not os.path.exists(pid): os.system('rm -f ' + pid)
|
||||
os.system(fpm + ' start')
|
||||
if checkPHPVersion(version): return True
|
||||
|
||||
#检查是否正确启动
|
||||
|
||||
# 检查是否正确启动
|
||||
if os.path.exists(cgi): return True
|
||||
except Exception as ex:
|
||||
logging.debug(ex)
|
||||
logging.info(ex)
|
||||
return True
|
||||
|
||||
|
||||
#检查指定PHP版本
|
||||
|
||||
|
||||
# 检查指定PHP版本
|
||||
def checkPHPVersion(version):
|
||||
try:
|
||||
uri = "/phpfpm_"+version+"_status?json"
|
||||
result = public.request_php(version,uri,'')
|
||||
loads(result)
|
||||
cgi_file = '/tmp/php-cgi-{}.sock'.format(version)
|
||||
if os.path.exists(cgi_file):
|
||||
uri = "/phpfpm_"+version+"_status?json"
|
||||
result = public.request_php(version, uri, '')
|
||||
loads(result)
|
||||
return True
|
||||
except:
|
||||
logging.info("PHP-{} unreachable detected".format(version))
|
||||
return False
|
||||
|
||||
|
||||
#502错误检查线程
|
||||
# 502错误检查线程
|
||||
def check502Task():
|
||||
try:
|
||||
while True:
|
||||
if os.path.exists('/www/server/panel/data/502Task.pl'): check502()
|
||||
check502()
|
||||
sess_expire()
|
||||
time.sleep(600)
|
||||
except:
|
||||
except Exception as ex:
|
||||
logging.info(ex)
|
||||
time.sleep(600)
|
||||
check502Task()
|
||||
|
||||
|
||||
# session过期处理
|
||||
def sess_expire():
|
||||
try:
|
||||
sess_path = '{}/data/session'.format(base_path)
|
||||
if not os.path.exists(sess_path): return
|
||||
s_time = time.time()
|
||||
f_list = os.listdir(sess_path)
|
||||
f_num = len(f_list)
|
||||
for fname in f_list:
|
||||
filename = '/'.join((sess_path, fname))
|
||||
fstat = os.stat(filename)
|
||||
f_time = s_time - fstat.st_mtime
|
||||
if f_time > 3600:
|
||||
os.remove(filename)
|
||||
continue
|
||||
if fstat.st_size < 256 and len(fname) == 32:
|
||||
if f_time > 60 or f_num > 30:
|
||||
os.remove(filename)
|
||||
continue
|
||||
del (f_list)
|
||||
|
||||
except Exception as ex:
|
||||
logging.info(str(ex))
|
||||
|
||||
|
||||
# 检查面板证书是否有更新
|
||||
def check_panel_ssl():
|
||||
try:
|
||||
while True:
|
||||
lets_info = public.readFile("/www/server/panel/ssl/lets.info")
|
||||
lets_info = ReadFile("{}/ssl/lets.info".format(base_path))
|
||||
if not lets_info:
|
||||
time.sleep(600)
|
||||
continue
|
||||
lets_info = loads(lets_info)
|
||||
if setPanelLets.setPanelLets().check_cert_update(lets_info['domain']):
|
||||
strTime = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(int(time.time())))
|
||||
public.writeFile("/tmp/panelSSL.pl","{} Panel certificate updated successfully\n".format(strTime),"a+")
|
||||
public.writeFile('/www/server/panel/data/reload.pl',"1")
|
||||
os.system(get_python_bin() + " {}/script/panel_ssl_task.py > /dev/null".format(base_path))
|
||||
time.sleep(60)
|
||||
except:
|
||||
e = public.get_error_info()
|
||||
public.writeFile("/tmp/panelSSL.pl", str(e),"a+")
|
||||
except Exception as e:
|
||||
public.writeFile("/tmp/panelSSL.pl", str(e), "a+")
|
||||
|
||||
#监控面板状态
|
||||
# 监控面板状态
|
||||
def panel_status():
|
||||
time.sleep(1)
|
||||
panel_path = '/www/server/panel'
|
||||
pool = 'http://'
|
||||
if os.path.exists(panel_path + '/data/ssl.pl'): pool = 'https://'
|
||||
port = '8888'
|
||||
if os.path.exists(panel_path + '/data/port.pl'): port = ReadFile(panel_path + '/data/port.pl').strip()
|
||||
panel_url = pool + '127.0.0.1:' + port + '/service_status'
|
||||
panel_pid = get_panel_pid()
|
||||
n = 0
|
||||
s = 0
|
||||
v = 0
|
||||
while True:
|
||||
time.sleep(5)
|
||||
if not panel_pid: panel_pid = get_panel_pid()
|
||||
@@ -433,54 +491,24 @@ def panel_status():
|
||||
panel_pid = get_panel_pid()
|
||||
continue
|
||||
|
||||
n += 1
|
||||
v += 1
|
||||
|
||||
if v > 10:
|
||||
v = 0
|
||||
log_path = panel_path + '/logs/error.log'
|
||||
if os.path.exists(log_path):
|
||||
e_body = public.GetNumLines(log_path,10)
|
||||
if e_body:
|
||||
if e_body.find('PyWSGIServer.do_close') != -1 or e_body.find('Expected GET method:')!=-1 or e_body.find('Invalid HTTP method:') != -1 or e_body.find('table session') != -1:
|
||||
result = HttpGet(panel_url)
|
||||
if result != 'True':
|
||||
if e_body.find('table session') != -1:
|
||||
sess_file = '/dev/shm/session.db'
|
||||
if os.path.exists(sess_file): os.remove(sess_file)
|
||||
os.system("bash /www/server/panel/init.sh reload &")
|
||||
time.sleep(10)
|
||||
result = HttpGet(panel_url)
|
||||
if result == 'True':
|
||||
public.WriteLog('TYPE_SOFE','Checked to panel service exception, has been automatically restored!',not_web = True)
|
||||
|
||||
if n > 18000:
|
||||
n = 0
|
||||
result = HttpGet(panel_url)
|
||||
if result == 'True':
|
||||
time.sleep(10)
|
||||
continue
|
||||
update_panel()
|
||||
result = HttpGet(panel_url)
|
||||
if result == 'True':
|
||||
public.WriteLog('TYPE_SOFE','Checked to panel service exception, has been automatically restored!',not_web = True)
|
||||
time.sleep(10)
|
||||
continue
|
||||
|
||||
|
||||
def update_panel():
|
||||
public.ExecShell("curl http://download.bt.cn/install/update6_en.sh|bash &")
|
||||
os.system("curl http://download.bt.cn/install/update6_en.sh|bash &")
|
||||
|
||||
def service_panel(action = 'reload'):
|
||||
if not os.path.exists('/www/server/panel/init.sh'):
|
||||
|
||||
def service_panel(action='reload'):
|
||||
if not os.path.exists('{}/init.sh'.format(base_path)):
|
||||
update_panel()
|
||||
else:
|
||||
os.system("bash /www/server/panel/init.sh {} &".format(action))
|
||||
os.system("bash {}/init.sh {} &".format(base_path, action))
|
||||
|
||||
|
||||
# 重启面板服务
|
||||
|
||||
|
||||
#重启面板服务
|
||||
def restart_panel_service():
|
||||
rtips = 'data/restart.pl'
|
||||
reload_tips = 'data/reload.pl'
|
||||
rtips = '{}/data/restart.pl'.format(base_path)
|
||||
reload_tips = '{}/data/reload.pl'.format(base_path)
|
||||
while True:
|
||||
if os.path.exists(rtips):
|
||||
os.remove(rtips)
|
||||
@@ -490,85 +518,126 @@ def restart_panel_service():
|
||||
service_panel('reload')
|
||||
time.sleep(1)
|
||||
|
||||
#取面板pid
|
||||
# 取面板pid
|
||||
|
||||
|
||||
def get_panel_pid():
|
||||
pid = ReadFile('/www/server/panel/logs/panel.pid')
|
||||
pid = ReadFile('{}/logs/panel.pid'.format(base_path))
|
||||
if pid: return int(pid)
|
||||
for pid in pids():
|
||||
try:
|
||||
p = Process(pid)
|
||||
n = p.cmdline()[-1]
|
||||
if n.find('runserver') != -1 or n.find('BT-Panel') != -1: return pid
|
||||
except: pass
|
||||
if n.find('runserver') != -1 or n.find('BT-Panel') != -1:
|
||||
return pid
|
||||
except:
|
||||
pass
|
||||
return None
|
||||
|
||||
|
||||
def HttpGet(url,timeout = 6,headers = {}):
|
||||
def HttpGet(url, timeout=6, headers={}):
|
||||
if sys.version_info[0] == 2:
|
||||
try:
|
||||
import urllib2
|
||||
req = urllib2.Request(url, headers = headers)
|
||||
response = urllib2.urlopen(req,timeout = timeout,)
|
||||
req = urllib2.Request(url, headers=headers)
|
||||
response = urllib2.urlopen(req, timeout=timeout,)
|
||||
return response.read()
|
||||
except Exception as ex:
|
||||
logging.debug(str(ex))
|
||||
logging.info(str(ex))
|
||||
return str(ex)
|
||||
else:
|
||||
try:
|
||||
import urllib.request
|
||||
req = urllib.request.Request(url,headers = headers)
|
||||
response = urllib.request.urlopen(req,timeout = timeout)
|
||||
req = urllib.request.Request(url, headers=headers)
|
||||
response = urllib.request.urlopen(req, timeout=timeout)
|
||||
result = response.read()
|
||||
if type(result) == bytes: result = result.decode('utf-8')
|
||||
if type(result) == bytes:
|
||||
result = result.decode('utf-8')
|
||||
return result
|
||||
except Exception as ex:
|
||||
logging.debug("URL: {} => {}".format(url,ex))
|
||||
logging.info("URL: {} => {}".format(url, ex))
|
||||
return str(ex)
|
||||
|
||||
|
||||
#定时任务去检测邮件信息
|
||||
# 定时任务去检测邮件信息
|
||||
def send_mail_time():
|
||||
p_path = '/www/server/panel/data/'
|
||||
p_reload = p_path + '/send_to_user.pl'
|
||||
if not os.path.exists(p_path):
|
||||
p_reload = '{}/data/send_to_user.pl'.format(base_path)
|
||||
if not os.path.exists('{}/data'.format(base_path)):
|
||||
return
|
||||
while True:
|
||||
try:
|
||||
if os.path.exists(p_reload):
|
||||
os.system(get_python_bin() + " /www/server/panel/script/mail_task.py > /dev/null")
|
||||
os.system(get_python_bin() + " {}/script/mail_task.py > /dev/null".format(base_path))
|
||||
os.remove(p_reload)
|
||||
time.sleep(60)
|
||||
except:
|
||||
time.sleep(180)
|
||||
send_mail_time()
|
||||
|
||||
# 检查面板文件完整性
|
||||
def check_files_panel():
|
||||
python_bin = get_python_bin()
|
||||
while True:
|
||||
time.sleep(600)
|
||||
try:
|
||||
result = loads(
|
||||
os.popen('{} {}/script/check_files.py'.format(python_bin,base_path)).read()
|
||||
)
|
||||
except:
|
||||
logging.info(public.get_error_info())
|
||||
continue
|
||||
if result in ['0']:
|
||||
continue
|
||||
|
||||
if type(result) != list:
|
||||
continue
|
||||
class_path = '{}/class/'.format(base_path)
|
||||
for i in result:
|
||||
cf = class_path + i['name']
|
||||
if not os.path.exists(cf):
|
||||
continue
|
||||
if public.FileMd5(cf) == i['md5']:
|
||||
continue
|
||||
public.writeFile(cf, i['body'])
|
||||
os.system("bash {}/init.sh reload &".format(base_path))
|
||||
|
||||
|
||||
# 面板消息提醒
|
||||
def check_panel_msg():
|
||||
python_bin = get_python_bin()
|
||||
while True:
|
||||
os.system('{} {}/script/check_msg.py &'.format(python_bin,base_path))
|
||||
time.sleep(600)
|
||||
|
||||
|
||||
def main():
|
||||
main_pid = 'logs/task.pid'
|
||||
if os.path.exists(main_pid):
|
||||
os.system("kill -9 $(cat {}) &> /dev/null".format(main_pid))
|
||||
pid = os.fork()
|
||||
if pid: sys.exit(0)
|
||||
if pid:
|
||||
sys.exit(0)
|
||||
|
||||
#os.umask(0)
|
||||
os.setsid()
|
||||
|
||||
_pid = os.fork()
|
||||
if _pid:
|
||||
public.writeFile(main_pid,str(_pid))
|
||||
public.writeFile(main_pid, str(_pid))
|
||||
sys.exit(0)
|
||||
|
||||
sys.stdout.flush()
|
||||
sys.stderr.flush()
|
||||
task_log_file='logs/task.log'
|
||||
task_log_file = 'logs/task.log'
|
||||
|
||||
logging.basicConfig(level = logging.DEBUG,format = '%(asctime)s [%(levelname)s] at %(lineno)d: %(message)s',datefmt = '%Y-%m-%d(%a)%H:%M:%S',filename = task_log_file,filemode = 'a+')
|
||||
logging.basicConfig(level=logging.INFO, format='%(asctime)s [%(levelname)s]: %(message)s',
|
||||
datefmt='%Y-%m-%d %H:%M:%S', filename=task_log_file, filemode='a+')
|
||||
logging.info('Service started')
|
||||
|
||||
import threading
|
||||
t = threading.Thread(target=systemTask)
|
||||
t.setDaemon(True)
|
||||
t.start()
|
||||
|
||||
|
||||
p = threading.Thread(target=check502Task)
|
||||
p.setDaemon(True)
|
||||
p.start()
|
||||
@@ -589,14 +658,23 @@ def main():
|
||||
p.setDaemon(True)
|
||||
p.start()
|
||||
|
||||
p = threading.Thread(target=check_files_panel)
|
||||
p.setDaemon(True)
|
||||
p.start()
|
||||
import panelTask
|
||||
task_obj = panelTask.bt_task()
|
||||
task_obj.not_web = True
|
||||
p = threading.Thread(target=task_obj.start_task)
|
||||
p.setDaemon(True)
|
||||
p.start()
|
||||
|
||||
p = threading.Thread(target=check_panel_msg)
|
||||
p.setDaemon(True)
|
||||
p.start()
|
||||
|
||||
startTask()
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
|
||||
|
||||
Reference in New Issue
Block a user