diff --git a/openshift/helper/__init__.py b/openshift/helper/__init__.py index 82de66c9..3bf622de 100644 --- a/openshift/helper/__init__.py +++ b/openshift/helper/__init__.py @@ -30,35 +30,6 @@ logger = logging.getLogger(__name__) -LOGGING = { - 'version': 1, - 'disable_existing_loggers': True, - 'handlers': { - 'file': { - 'level': 'DEBUG', - 'class': 'logging.FileHandler', - 'filename': 'KubeObjHelper.log', - 'mode': 'a', - 'encoding': 'utf-8' - }, - 'null': { - 'level': 'ERROR', - 'class': 'logging.NullHandler' - } - }, - 'loggers': { - 'openshift.helper': { - 'handlers': ['file'], - 'level': 'INFO', - 'propagate': False - }, - }, - 'root': { - 'handlers': ['null'], - 'level': 'ERROR' - } -} - class KubernetesObjectHelper(object): @@ -109,12 +80,39 @@ def set_client_config(self, **auth): setattr(self.api_client.config, key, auth[key]) @staticmethod - def enable_debug(reset_logfile=True): - """ Turn on debugging. If reset_logfile, then remove the existing log file. """ - if reset_logfile: - LOGGING['handlers']['file']['mode'] = 'w' - LOGGING['loggers'][__name__]['level'] = 'DEBUG' - logging_config.dictConfig(LOGGING) + def enable_debug(to_file=True, filename='KubeObjHelper.log', reset_logfile=True): + logger_config = { + 'version': 1, + 'level': 'DEBUG', + 'propogate': False, + 'loggers':{ + 'openshift.helper': { + 'handlers': ['debug_logger'], + 'level': 'DEBUG', + 'propagate': False + } + } + } + if to_file: + mode = 'w' if reset_logfile else 'a' + logger_config['handlers'] = { + 'debug_logger': { + 'class': 'logging.FileHandler', + 'level': 'DEBUG', + 'filename': filename, + 'mode': mode, + 'encoding': 'utf-8' + } + } + else: + logger_config['handlers'] = { + 'debug_logger': { + 'class': 'logging.StreamHandler', + 'level': 'DEBUG' + } + } + logging.config.dictConfig(logger_config) + def get_object(self, name, namespace=None): k8s_obj = None diff --git a/test/functional/conftest.py b/test/functional/conftest.py index db6a35bc..07e3d950 100644 --- a/test/functional/conftest.py +++ b/test/functional/conftest.py @@ -119,7 +119,8 @@ def admin_ansible_helper(request, admin_kubeconfig): 'host': 'https://localhost:8443', 'verify_ssl': False } - helper = AnsibleModuleHelper(api_version, resource, debug=True, reset_logfile=False, **auth) + helper = AnsibleModuleHelper(api_version, resource, **auth) + helper.enable_debug(to_file=False) helper.api_client.config.debug = True return helper