Update public.py

ulimit 不应作为必要条件，部分容器等环境下不支持 ulimit 设置过大
365-W · Jul 2, 2019 · 300e5b9 · 300e5b9
1 parent 10d7cbe
commit 300e5b9
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/class/public.py b/class/public.py
@@ -734,10 +734,10 @@ def checkWebConfig():
             if os.path.exists(f3): os.remove(f3)
 
     if get_webserver() == 'nginx':
-        result = ExecShell("ulimit -n 8192 && /www/server/nginx/sbin/nginx -t -c /www/server/nginx/conf/nginx.conf");
+        result = ExecShell("ulimit -n 8192 ; /www/server/nginx/sbin/nginx -t -c /www/server/nginx/conf/nginx.conf");
         searchStr = 'successful'
     else:
-        result = ExecShell("ulimit -n 8192 && /www/server/apache/bin/apachectl -t");
+        result = ExecShell("ulimit -n 8192 ; /www/server/apache/bin/apachectl -t");
         searchStr = 'Syntax OK'
 
     if result[1].find(searchStr) == -1:
@@ -1252,4 +1252,4 @@ def set_own(filename,user,group=None):
         user = user_info.pw_uid
         group = user_info.pw_gid
     os.chown(filename,user,group)
-    return True
+    return True