From 98e6e6963f0d4a05237d21424671857b74449574 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Wed, 16 Oct 2019 13:31:30 +0200 Subject: [PATCH] Remove imports --- wo/cli/plugins/clean.py | 1 - wo/cli/plugins/debug.py | 1 - wo/cli/plugins/import_slow_log.py | 1 - wo/cli/plugins/info.py | 50 +++++++++++++++---------------- wo/cli/plugins/log.py | 1 - wo/cli/plugins/secure.py | 2 +- wo/cli/plugins/site.py | 1 - wo/cli/plugins/stack_services.py | 1 - wo/cli/plugins/stack_upgrade.py | 2 -- wo/cli/plugins/sync.py | 1 - wo/cli/plugins/update.py | 1 - 11 files changed, 26 insertions(+), 36 deletions(-) diff --git a/wo/cli/plugins/clean.py b/wo/cli/plugins/clean.py index ceb1f21..b866fc4 100644 --- a/wo/cli/plugins/clean.py +++ b/wo/cli/plugins/clean.py @@ -3,7 +3,6 @@ import os import urllib.request -from cement.core import handler, hook from cement.core.controller import CementBaseController, expose from wo.core.aptget import WOAptGet diff --git a/wo/cli/plugins/debug.py b/wo/cli/plugins/debug.py index c54dccb..1cb171e 100644 --- a/wo/cli/plugins/debug.py +++ b/wo/cli/plugins/debug.py @@ -5,7 +5,6 @@ import glob import os import signal -from cement.core import handler, hook from cement.core.controller import CementBaseController, expose from pynginxconfig import NginxConfig diff --git a/wo/cli/plugins/import_slow_log.py b/wo/cli/plugins/import_slow_log.py index 570b59a..282ccb4 100644 --- a/wo/cli/plugins/import_slow_log.py +++ b/wo/cli/plugins/import_slow_log.py @@ -1,4 +1,3 @@ -from cement.core import handler, hook from cement.core.controller import CementBaseController, expose from wo.core.logging import Log diff --git a/wo/cli/plugins/info.py b/wo/cli/plugins/info.py index 87d22c0..cb505fe 100644 --- a/wo/cli/plugins/info.py +++ b/wo/cli/plugins/info.py @@ -3,7 +3,6 @@ import configparser import os -from cement.core import handler, hook from cement.core.controller import CementBaseController, expose from pynginxconfig import NginxConfig @@ -80,20 +79,20 @@ class WOInfoController(CementBaseController): max_execution_time = config['PHP']['max_execution_time'] config.read('/etc/{0}/fpm/pool.d/www.conf'.format("php/7.2")) - www_listen = config['www']['listen'] - www_ping_path = config['www']['ping.path'] - www_pm_status_path = config['www']['pm.status_path'] - www_pm = config['www']['pm'] - www_pm_max_requests = config['www']['pm.max_requests'] - www_pm_max_children = config['www']['pm.max_children'] - www_pm_start_servers = config['www']['pm.start_servers'] - www_pm_min_spare_servers = config['www']['pm.min_spare_servers'] - www_pm_max_spare_servers = config['www']['pm.max_spare_servers'] - www_request_terminate_time = (config['www'] + www_listen = config['www-php72']['listen'] + www_ping_path = config['www-php72']['ping.path'] + www_pm_status_path = config['www-php72']['pm.status_path'] + www_pm = config['www-php72']['pm'] + www_pm_max_requests = config['www-php72']['pm.max_requests'] + www_pm_max_children = config['www-php72']['pm.max_children'] + www_pm_start_servers = config['www-php72']['pm.start_servers'] + www_pm_min_spare_servers = config['www-php72']['pm.min_spare_servers'] + www_pm_max_spare_servers = config['www-php72']['pm.max_spare_servers'] + www_request_terminate_time = (config['www-php72'] ['request_terminate_timeout']) try: - www_xdebug = (config['www']['php_admin_flag[xdebug.profiler_enable' - '_trigger]']) + www_xdebug = (config['www-php72']['php_admin_flag[xdebug.profiler_enable' + '_trigger]']) except Exception as e: Log.debug(self, "{0}".format(e)) www_xdebug = 'off' @@ -157,20 +156,21 @@ class WOInfoController(CementBaseController): max_execution_time = config['PHP']['max_execution_time'] config.read('/etc/php/7.3/fpm/pool.d/www.conf') - www_listen = config['www']['listen'] - www_ping_path = config['www']['ping.path'] - www_pm_status_path = config['www']['pm.status_path'] - www_pm = config['www']['pm'] - www_pm_max_requests = config['www']['pm.max_requests'] - www_pm_max_children = config['www']['pm.max_children'] - www_pm_start_servers = config['www']['pm.start_servers'] - www_pm_min_spare_servers = config['www']['pm.min_spare_servers'] - www_pm_max_spare_servers = config['www']['pm.max_spare_servers'] - www_request_terminate_time = (config['www'] + www_listen = config['www-php73']['listen'] + www_ping_path = config['www-php73']['ping.path'] + www_pm_status_path = config['www-php73']['pm.status_path'] + www_pm = config['www-php73']['pm'] + www_pm_max_requests = config['www-php73']['pm.max_requests'] + www_pm_max_children = config['www-php73']['pm.max_children'] + www_pm_start_servers = config['www-php73']['pm.start_servers'] + www_pm_min_spare_servers = config['www-php73']['pm.min_spare_servers'] + www_pm_max_spare_servers = config['www-php73']['pm.max_spare_servers'] + www_request_terminate_time = (config['www-php73'] ['request_terminate_timeout']) try: - www_xdebug = (config['www']['php_admin_flag[xdebug.profiler_enable' - '_trigger]']) + www_xdebug = (config['www-php73'] + ['php_admin_flag[xdebug.profiler_enable' + '_trigger]']) except Exception as e: Log.debug(self, "{0}".format(e)) www_xdebug = 'off' diff --git a/wo/cli/plugins/log.py b/wo/cli/plugins/log.py index 838f5cb..68f9974 100644 --- a/wo/cli/plugins/log.py +++ b/wo/cli/plugins/log.py @@ -4,7 +4,6 @@ import glob import gzip import os -from cement.core import handler, hook from cement.core.controller import CementBaseController, expose from wo.cli.plugins.site_functions import logwatch diff --git a/wo/cli/plugins/secure.py b/wo/cli/plugins/secure.py index 719e0b5..1123b3e 100644 --- a/wo/cli/plugins/secure.py +++ b/wo/cli/plugins/secure.py @@ -1,8 +1,8 @@ import getpass import os -from cement.core import handler, hook from cement.core.controller import CementBaseController, expose + from wo.core.fileutils import WOFileUtils from wo.core.git import WOGit from wo.core.logging import Log diff --git a/wo/cli/plugins/site.py b/wo/cli/plugins/site.py index f61b928..d293c3b 100644 --- a/wo/cli/plugins/site.py +++ b/wo/cli/plugins/site.py @@ -3,7 +3,6 @@ import json import os import subprocess -from cement.core import handler, hook from cement.core.controller import CementBaseController, expose from wo.cli.plugins.site_functions import * from wo.cli.plugins.sitedb import (addNewSite, deleteSiteInfo, getAllsites, diff --git a/wo/cli/plugins/stack_services.py b/wo/cli/plugins/stack_services.py index 84598e4..c9c4f43 100644 --- a/wo/cli/plugins/stack_services.py +++ b/wo/cli/plugins/stack_services.py @@ -1,6 +1,5 @@ import os -from cement.core import handler, hook from cement.core.controller import CementBaseController, expose from wo.core.aptget import WOAptGet diff --git a/wo/cli/plugins/stack_upgrade.py b/wo/cli/plugins/stack_upgrade.py index e4415b5..5ee3769 100644 --- a/wo/cli/plugins/stack_upgrade.py +++ b/wo/cli/plugins/stack_upgrade.py @@ -1,7 +1,6 @@ import os import shutil -from cement.core import handler, hook from cement.core.controller import CementBaseController, expose from wo.cli.plugins.stack_pref import post_pref, pre_pref @@ -10,7 +9,6 @@ from wo.core.download import WODownload from wo.core.extract import WOExtract from wo.core.fileutils import WOFileUtils from wo.core.logging import Log -from wo.core.services import WOService from wo.core.shellexec import WOShellExec from wo.core.variables import WOVar diff --git a/wo/cli/plugins/sync.py b/wo/cli/plugins/sync.py index 209003b..662466d 100644 --- a/wo/cli/plugins/sync.py +++ b/wo/cli/plugins/sync.py @@ -1,6 +1,5 @@ import glob -from cement.core import handler, hook from cement.core.controller import CementBaseController, expose from wo.cli.plugins.sitedb import getAllsites, updateSiteInfo diff --git a/wo/cli/plugins/update.py b/wo/cli/plugins/update.py index 6ef7fb8..28f8287 100644 --- a/wo/cli/plugins/update.py +++ b/wo/cli/plugins/update.py @@ -1,7 +1,6 @@ import os import time -from cement.core import handler, hook from cement.core.controller import CementBaseController, expose from wo.core.download import WODownload