Skip to content

Commit aa83ab6

Browse files
committed
logger: rewrite how logger is init, and dont use coloredclass anymore. closes kivy#320
1 parent ef540ce commit aa83ab6

File tree

2 files changed

+17
-31
lines changed

2 files changed

+17
-31
lines changed

kivy/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ def kivy_usage():
175175

176176

177177
# Start !
178+
Logger.setLevel(level=LOG_LEVELS.get('info'))
178179
Logger.info('Kivy v%s' % (__version__))
179180

180181
#: Global settings options for kivy

kivy/logger.py

Lines changed: 16 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -252,33 +252,6 @@ def filter(self, record):
252252
return True
253253

254254

255-
class ColoredLogger(logging.Logger):
256-
257-
use_color = True
258-
if os.name == 'nt':
259-
use_color = False
260-
261-
FORMAT = '[%(levelname)-18s] %(message)s'
262-
COLOR_FORMAT = formatter_message(FORMAT, use_color)
263-
264-
def __init__(self, name):
265-
logging.Logger.__init__(self, name, logging.DEBUG)
266-
color_formatter = ColoredFormatter(self.COLOR_FORMAT,
267-
use_color=self.use_color)
268-
console = ConsoleHandler()
269-
console.setFormatter(color_formatter)
270-
271-
self.addHandler(LoggerHistory())
272-
self.addHandler(FileHandler())
273-
274-
# Use the custom handler instead of streaming one.
275-
if hasattr(sys, '_kivy_logging_handler'):
276-
self.addHandler(getattr(sys, '_kivy_logging_handler'))
277-
else:
278-
self.addHandler(console)
279-
return
280-
281-
282255
class LogFile(object):
283256

284257
def __init__(self, channel, func):
@@ -299,14 +272,26 @@ def write(self, s):
299272
def flush(self):
300273
return
301274

302-
if 'nosetests' not in sys.argv:
303-
logging.setLoggerClass(ColoredLogger)
304-
305275
#: Kivy default logger instance
306-
Logger = logging.getLogger('Kivy')
276+
Logger = logging.getLogger('kivy')
307277
Logger.logfile_activated = False
308278
Logger.trace = partial(Logger.log, logging.TRACE)
309279

280+
# add default kivy logger
281+
Logger.addHandler(LoggerHistory())
282+
Logger.addHandler(FileHandler())
283+
284+
# Use the custom handler instead of streaming one.
285+
if hasattr(sys, '_kivy_logging_handler'):
286+
Logger.addHandler(getattr(sys, '_kivy_logging_handler'))
287+
else:
288+
use_color = os.name != 'nt'
289+
color_fmt = formatter_message('[%(levelname)-18s] %(message)s', use_color)
290+
formatter = ColoredFormatter(color_fmt, use_color=use_color)
291+
console = ConsoleHandler()
292+
console.setFormatter(formatter)
293+
Logger.addHandler(console)
294+
310295
# install stderr handlers
311296
sys.stderr = LogFile('stderr', Logger.warning)
312297

0 commit comments

Comments
 (0)