mirror of
https://github.com/ansible/awx.git
synced 2026-05-19 23:07:42 -02:30
Fix environment-specific rough edges of logging setup (#15193)
This commit is contained in:
@@ -4,6 +4,7 @@
|
|||||||
# Python
|
# Python
|
||||||
import base64
|
import base64
|
||||||
import logging
|
import logging
|
||||||
|
import logging.handlers
|
||||||
import sys
|
import sys
|
||||||
import traceback
|
import traceback
|
||||||
import os
|
import os
|
||||||
@@ -27,6 +28,9 @@ from opentelemetry.sdk._logs.export import BatchLogRecordProcessor
|
|||||||
from opentelemetry.sdk.resources import Resource
|
from opentelemetry.sdk.resources import Resource
|
||||||
|
|
||||||
|
|
||||||
|
__all__ = ['RSysLogHandler', 'SpecialInventoryHandler', 'ColorHandler']
|
||||||
|
|
||||||
|
|
||||||
class RSysLogHandler(logging.handlers.SysLogHandler):
|
class RSysLogHandler(logging.handlers.SysLogHandler):
|
||||||
append_nul = False
|
append_nul = False
|
||||||
|
|
||||||
@@ -109,7 +113,6 @@ class SpecialInventoryHandler(logging.Handler):
|
|||||||
|
|
||||||
|
|
||||||
if settings.COLOR_LOGS is True:
|
if settings.COLOR_LOGS is True:
|
||||||
try:
|
|
||||||
from logutils.colorize import ColorizingStreamHandler
|
from logutils.colorize import ColorizingStreamHandler
|
||||||
import colorama
|
import colorama
|
||||||
|
|
||||||
@@ -139,9 +142,6 @@ if settings.COLOR_LOGS is True:
|
|||||||
logging.CRITICAL: (None, 'red', True),
|
logging.CRITICAL: (None, 'red', True),
|
||||||
}
|
}
|
||||||
|
|
||||||
except ImportError:
|
|
||||||
# logutils is only used for colored logs in the dev environment
|
|
||||||
pass
|
|
||||||
else:
|
else:
|
||||||
ColorHandler = logging.StreamHandler
|
ColorHandler = logging.StreamHandler
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user