php update

plugins/php/conf/www.conf

@@ -10,7 +10,6 @@ pm.start_servers = 2
 pm.min_spare_servers = 1
 pm.max_spare_servers = 3
 pm.status_path = /phpfpm_status_{$PHP_VERSION}
-
-
-request_slowlog_timeout = 1
+request_terminate_timeout = 100
+request_slowlog_timeout = 30
 slowlog = {$SERVER_PATH}/php/{$PHP_VERSION}/var/log/www-slow.log

plugins/php/index.html

@@ -7,8 +7,9 @@
 			<p onclick="phpLibConfig($('.plugin_version').attr('version'));">安装扩展</p>
 			<p onclick="phpSetConfig($('.plugin_version').attr('version'));">配置修改</p>
 			<p onclick="phpUploadLimitReq($('.plugin_version').attr('version'));">上传限制</p>
-			<!-- <p onclick="phpTimeLimitReq($('.plugin_version').attr('version'));">超时限制</p> -->
+			<p onclick="phpTimeLimitReq($('.plugin_version').attr('version'));">超时限制</p>
 			<p onclick="pluginConfig('php', $('.plugin_version').attr('version'));">配置文件</p>
+			<p onclick="pluginConfig('php', $('.plugin_version').attr('version'),'get_fpm_conf');">FPM配置</p>
 			<p onclick="disableFunc($('.plugin_version').attr('version'));">禁用函数</p>
 			<p onclick="getFpmConfig($('.plugin_version').attr('version'));">性能调整</p>
 			<p onclick="getFpmStatus($('.plugin_version').attr('version'));">负载状况</p>

plugins/php/index.py

@@ -204,6 +204,10 @@ def phpFpmWwwReplace(version):
         mw.writeFile(service_php_fpmwww, content)
 
 
+def getFpmConf(version):
+    return getServerDir() + '/' + version + '/etc/php-fpm.d/www.conf'
+
+
 def makePhpIni(version):
     dst_ini = mw.getServerDir() + '/php/' + version + '/etc/php.ini'
     if not os.path.exists(dst_ini):
@@ -400,7 +404,7 @@ def submitPhpConf(version):
 def getLimitConf(version):
     fileini = getServerDir() + "/" + version + "/etc/php.ini"
     phpini = mw.readFile(fileini)
-    filefpm = getServerDir() + "/" + version + "/etc/php-fpm.conf"
+    filefpm = getFpmConf(version)
     phpfpm = mw.readFile(filefpm)
 
     # print fileini, filefpm
@@ -443,7 +447,7 @@ def setMaxTime(version):
     if int(time) < 30 or int(time) > 86400:
         return mw.returnJson(False, '请填写30-86400间的值!')
 
-    filefpm = getServerDir() + "/" + version + "/etc/php-fpm.conf"
+    filefpm = getFpmConf(version)
     conf = mw.readFile(filefpm)
     rep = "request_terminate_timeout\s*=\s*([0-9]+)\n"
     conf = re.sub(rep, "request_terminate_timeout = " + time + "\n", conf)
@@ -762,6 +766,8 @@ if __name__ == "__main__":
         print(getConfAppStart())
     elif func == 'get_php_conf':
         print(getPhpConf(version))
+    elif func == 'get_fpm_conf':
+        print(getFpmConf(version))
     elif func == 'submit_php_conf':
         print(submitPhpConf(version))
     elif func == 'get_limit_conf':