External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-07 19:51:08 -03:30
Code Issues Packages Projects Releases Wiki Activity

get rid of HTTPSHandler subclass which is not needed

Browse Source
This commit is contained in:
AlanCoding
2017-02-13 14:54:02 -05:00
parent d912013db7
commit 603dfea580
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/main/utils/handlers.py
View File

@@ -16,7 +16,7 @@ from requests_futures.sessions import FuturesSession
from awx.main.utils.formatters import LogstashFormatter from awx.main.utils.formatters import LogstashFormatter
__all__ = ['HTTPSNullHandler', 'BaseHTTPSHandler', 'HTTPSHandler', 'configure_external_logger'] __all__ = ['HTTPSNullHandler', 'BaseHTTPSHandler', 'configure_external_logger']
# AWX external logging handler, generally designed to be used # AWX external logging handler, generally designed to be used
# with the accompanying LogstashHandler, derives from python-logstash library # with the accompanying LogstashHandler, derives from python-logstash library
@@ -168,16 +168,10 @@ class BaseHTTPSHandler(logging.Handler):
**self.get_post_kwargs(payload)) **self.get_post_kwargs(payload))
class HTTPSHandler(object):
def __new__(cls, settings_module, *args, **kwargs):
return BaseHTTPSHandler.from_django_settings(settings_module, *args, **kwargs)
def add_or_remove_logger(address, instance): def add_or_remove_logger(address, instance):
specific_logger = logging.getLogger(address) specific_logger = logging.getLogger(address)
i_occurance = None i_occurance = None
for i in range(len(specific_logger.handlers)): for i, _ in enumerate(specific_logger.handlers):
if isinstance(specific_logger.handlers[i], (HTTPSNullHandler, BaseHTTPSHandler)): if isinstance(specific_logger.handlers[i], (HTTPSNullHandler, BaseHTTPSHandler)):
i_occurance = i i_occurance = i
break break
@@ -201,7 +195,7 @@ def configure_external_logger(settings_module, async_flag=True, is_startup=True)
instance = None instance = None
if is_enabled: if is_enabled:
instance = HTTPSHandler(settings_module, async=async_flag) instance = BaseHTTPSHandler.from_django_settings(settings_module, async=async_flag)
instance.setFormatter(LogstashFormatter()) instance.setFormatter(LogstashFormatter())
awx_logger_instance = instance awx_logger_instance = instance
if is_enabled and 'awx' not in settings_module.LOG_AGGREGATOR_LOGGERS: if is_enabled and 'awx' not in settings_module.LOG_AGGREGATOR_LOGGERS: