Malin/WPIQ
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix wo_ouputhandler

Browse Source
This commit is contained in:
VirtuBox
2019-10-30 05:26:44 +01:00
parent 97fd871ede
commit 1ce64e62df
2 changed files with 25 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
wo/cli/ext/wo_outputhandler.py
View File

@@ -19,4 +19,3 @@ class WOOutputHandler(MustacheOutputHandler):
return open(full_path, encoding='utf-8', mode='r').read() return open(full_path, encoding='utf-8', mode='r').read()
else: else:
continue continue
return 1

61
wo/cli/plugins/info.py
View File

@@ -80,29 +80,22 @@ class WOInfoController(CementBaseController):
config.read('/etc/{0}/fpm/pool.d/www.conf'.format("php/7.2")) config.read('/etc/{0}/fpm/pool.d/www.conf'.format("php/7.2"))
wo_sec = config.sections() wo_sec = config.sections()
www_listen = config['{0}' config.read('/etc/{0}/fpm/pool.d/www.conf'.format("php/7.2"))
.format(wo_sec[0])]['listen'] www_listen = config[wo_sec[0]]['listen']
www_ping_path = config['{0}'.format(wo_sec[0])]['ping.path'] www_ping_path = config[wo_sec[0]]['ping.path']
www_pm_status_path = config['{0}'.format(wo_sec[0])]['pm.status_path'] www_pm_status_path = config[wo_sec[0]]['pm.status_path']
www_pm = config['{0}'.format(wo_sec[0])]['pm'] www_pm = config[wo_sec[0]]['pm']
www_pm_max_requests = config['{0}'.format( www_pm_max_requests = config[wo_sec[0]]['pm.max_requests']
wo_sec[0])]['pm.max_requests'] www_pm_max_children = config[wo_sec[0]]['pm.max_children']
www_pm_max_children = config['{0}'.format( www_pm_start_servers = config[wo_sec[0]]['pm.start_servers']
wo_sec[0])]['pm.max_children'] www_pm_min_spare_servers = config[wo_sec[0]]['pm.min_spare_servers']
www_pm_start_servers = config['{0}'.format( www_pm_max_spare_servers = config[wo_sec[0]]['pm.max_spare_servers']
wo_sec[0])]['pm.start_servers'] www_request_terminate_time = (config[wo_sec[0]]
www_pm_min_spare_servers = config['{0}'.format(
wo_sec[0])]['pm.min_spare_servers']
www_pm_max_spare_servers = config['{0}'.format(
wo_sec[0])]['pm.max_spare_servers']
www_request_terminate_time = (config['{0}'.format(wo_sec[0])]
['request_terminate_timeout']) ['request_terminate_timeout'])
try: try:
www_xdebug = ( www_xdebug = (
config['{0}' config[wo_sec[0]]['php_admin_flag[xdebug.profiler_enable'
.format(wo_sec[0])][ '_trigger]'])
'php_admin_flag[xdebug.profiler_enable'
'_trigger]'])
except Exception as e: except Exception as e:
Log.debug(self, "{0}".format(e)) Log.debug(self, "{0}".format(e))
www_xdebug = 'off' www_xdebug = 'off'
@@ -167,24 +160,20 @@ class WOInfoController(CementBaseController):
config.read('/etc/php/7.3/fpm/pool.d/www.conf') config.read('/etc/php/7.3/fpm/pool.d/www.conf')
wo_sec = config.sections() wo_sec = config.sections()
www_listen = config['{0}'.format(wo_sec[0])]['listen'] config.read('/etc/php/7.3/fpm/pool.d/www.conf')
www_ping_path = config['{0}'.format(wo_sec[0])]['ping.path'] www_listen = config[wo_sec[0]]['listen']
www_pm_status_path = config['{0}'.format(wo_sec[0])]['pm.status_path'] www_ping_path = config[wo_sec[0]]['ping.path']
www_pm = config['{0}'.format(wo_sec[0])]['pm'] www_pm_status_path = config[wo_sec[0]]['pm.status_path']
www_pm_max_requests = config['{0}'.format( www_pm = config[wo_sec[0]]['pm']
wo_sec[0])]['pm.max_requests'] www_pm_max_requests = config[wo_sec[0]]['pm.max_requests']
www_pm_max_children = config['{0}'.format( www_pm_max_children = config[wo_sec[0]]['pm.max_children']
wo_sec[0])]['pm.max_children'] www_pm_start_servers = config[wo_sec[0]]['pm.start_servers']
www_pm_start_servers = config['{0}'.format( www_pm_min_spare_servers = config[wo_sec[0]]['pm.min_spare_servers']
wo_sec[0])]['pm.start_servers'] www_pm_max_spare_servers = config[wo_sec[0]]['pm.max_spare_servers']
www_pm_min_spare_servers = config['{0}'.format( www_request_terminate_time = (config[wo_sec[0]]
wo_sec[0])]['pm.min_spare_servers']
www_pm_max_spare_servers = config['{0}'.format(
wo_sec[0])]['pm.max_spare_servers']
www_request_terminate_time = (config['{0}'.format(wo_sec[0])]
['request_terminate_timeout']) ['request_terminate_timeout'])
try: try:
www_xdebug = (config['{0}'.format(wo_sec[0])] www_xdebug = (config[wo_sec[0]]
['php_admin_flag[xdebug.profiler_enable' ['php_admin_flag[xdebug.profiler_enable'
'_trigger]']) '_trigger]'])
except Exception as e: except Exception as e: