55
66from .logging_settings import (
77 ApplicationLevelFilter ,
8- ColoredFormatter ,
9- IgnoreNANTraceFormatter ,
8+ BasicFormatter ,
109 LoggingSettings ,
11- PlainFormatter ,
12- PlainSysLogFormatter ,
1310 SysLogFormatter ,
1411)
1512from .tracer import RequestIdFilter
@@ -89,18 +86,12 @@ def _setup_syslog_handler(self, logger: logging.Logger):
8986 return
9087
9188 try :
92- if self .settings .use_syslog_colored_formatter :
93- syslog_formatter = SysLogFormatter (
94- fmt = self .settings .log_format ,
95- datefmt = self .settings .date_format ,
96- style = self .settings .style ,
97- )
98- else :
99- syslog_formatter = PlainSysLogFormatter (
100- fmt = self .settings .log_format ,
101- datefmt = self .settings .date_format ,
102- style = self .settings .style ,
103- )
89+ syslog_formatter = SysLogFormatter (
90+ fmt = self .settings .log_format ,
91+ datefmt = self .settings .date_format ,
92+ style = self .settings .style ,
93+ colored = self .settings .use_syslog_colored_formatter ,
94+ )
10495
10596 # Create handler with socket handling
10697 syslog_handler = logging .handlers .SysLogHandler (
@@ -127,23 +118,16 @@ def _setup_syslog_handler(self, logger: logging.Logger):
127118 logger .warning (f"Failed to setup syslog handler: { str (e )} " )
128119 print (f"Failed to setup syslog handler: { str (e )} " )
129120
130- def _get_formatter (self , colored : bool = False ):
131- if colored and self .settings .enable_tracing and self .settings .ignore_nan_trace :
132- return IgnoreNANTraceFormatter (
133- fmt = self .settings .log_format ,
134- datefmt = self .settings .date_format ,
135- style = self .settings .style ,
136- )
137- elif colored :
138- return ColoredFormatter (
139- fmt = self .settings .log_format ,
140- datefmt = self .settings .date_format ,
141- style = self .settings .style ,
142- )
143- return PlainFormatter (
121+ def _get_formatter (
122+ self ,
123+ colored : bool = False ,
124+ ):
125+ return BasicFormatter (
144126 fmt = self .settings .log_format ,
145127 datefmt = self .settings .date_format ,
146128 style = self .settings .style ,
129+ colored = colored ,
130+ remove_nan_trace = self .settings .ignore_nan_trace ,
147131 )
148132
149133 def _setup_handlers (self , logger : logging .Logger ):
0 commit comments