WEBDIENSTE/aaPanel
1
0
Fork 0
mirror of https://github.com/aaPanel/aaPanel.git synced 2026-08-26 17:42:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update system.py

Browse Source
This commit is contained in:
jose
2019-07-03 18:35:44 +08:00
parent 72f2bd58ce
commit f91a41bf39
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
class/system.py
+3 -3
View File
@@ -448,7 +448,7 @@ class system:
networkInfo['load'] = self.GetLoadAverage(get);
networkInfo['mem'] = self.GetMemInfo(get)
networkInfo['version'] = session['version']
#networkInfo['disk'] = self.GetDiskInfo2()
networkInfo['disk'] = self.GetDiskInfo2()
return networkInfo
@@ -602,7 +602,7 @@ class system:
public.ExecShell('/etc/init.d/httpd stop');
self.kill_port()
result = public.ExecShell('ulimit -n 8192 && ' + self.setupPath+'/apache/bin/apachectl -t');
result = public.ExecShell('ulimit -n 8192 ; ' + self.setupPath+'/apache/bin/apachectl -t');
if result[1].find('Syntax OK') == -1:
public.WriteLog("TYPE_SOFT",'SYS_EXEC_ERR', (str(result),));
return public.returnMsg(False,'SYS_CONF_APACHE_ERR',(result[1].replace("\n",'<br>'),));
@@ -621,7 +621,7 @@ class system:
public.ExecShell('mkdir ' + vhostPath);
public.ExecShell('/etc/init.d/nginx start');
result = public.ExecShell('ulimit -n 8192 && nginx -t -c '+self.setupPath+'/nginx/conf/nginx.conf');
result = public.ExecShell('ulimit -n 8192 ; nginx -t -c '+self.setupPath+'/nginx/conf/nginx.conf');
if result[1].find('perserver') != -1:
limit = self.setupPath + '/nginx/conf/nginx.conf';
nginxConf = public.readFile(limit);