Skip to content

Commit

Permalink
Fixed self._log call being performed on the wrong log handler
Browse files Browse the repository at this point in the history
  • Loading branch information
@evandrocoan
evandrocoan committed Sep 14, 2019
1 parent 1f933da commit cb1f3d4
Showing 1 changed file with 24 additions and 30 deletions.
54 changes: 24 additions & 30 deletions all/debug_tools/logger.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,12 +376,12 @@ def __call__(self, debug_level=1, msg=EMPTY_KWARG, *args, **kwargs):
def _fast_clean(self, debug_level=1, msg=EMPTY_KWARG, *args, **kwargs):

if self._debugger_level & debug_level != 0:
self = self.active or self
other = self.active or self

old_formatters = {}
_acquireLock()
try:
for handler in self.handlers:
for handler in other.handlers:
old_formatters[handler] = handler.formatter
handler.formatter = self.clean_formatter

Expand All @@ -407,12 +407,12 @@ def clean(self, debug_level=1, msg=EMPTY_KWARG, *args, **kwargs):
if msg is EMPTY_KWARG:

if self._debugger_level & 1 != 0:
self = self.active or self
other = self.active or self

old_formatters = {}
_acquireLock()
try:
for handler in self.handlers:
for handler in other.handlers:
old_formatters[handler] = handler.formatter
handler.formatter = self.clean_formatter

Expand All @@ -426,12 +426,12 @@ def clean(self, debug_level=1, msg=EMPTY_KWARG, *args, **kwargs):
handler.formatter = formatter

elif self._debugger_level & debug_level != 0:
self = self.active or self
other = self.active or self

old_formatters = {}
_acquireLock()
try:
for handler in self.handlers:
for handler in other.handlers:
old_formatters[handler] = handler.formatter
handler.formatter = self.clean_formatter

Expand All @@ -449,12 +449,12 @@ def clean(self, debug_level=1, msg=EMPTY_KWARG, *args, **kwargs):
if self._debugger_level & 1 != 0:

if msg is EMPTY_KWARG:
self = self.active or self
other = self.active or self

old_formatters = {}
_acquireLock()
try:
for handler in self.handlers:
for handler in other.handlers:
old_formatters[handler] = handler.formatter
handler.formatter = self.clean_formatter

Expand All @@ -468,12 +468,12 @@ def clean(self, debug_level=1, msg=EMPTY_KWARG, *args, **kwargs):
handler.formatter = formatter

else:
self = self.active or self
other = self.active or self

old_formatters = {}
_acquireLock()
try:
for handler in self.handlers:
for handler in other.handlers:
old_formatters[handler] = handler.formatter
handler.formatter = self.clean_formatter

Expand All @@ -489,12 +489,12 @@ def clean(self, debug_level=1, msg=EMPTY_KWARG, *args, **kwargs):
def _fast_basic(self, debug_level=1, msg=EMPTY_KWARG, *args, **kwargs):

if self._debugger_level & debug_level != 0:
self = self.active or self
other = self.active or self

old_formatters = {}
_acquireLock()
try:
for handler in self.handlers:
for handler in other.handlers:
old_formatters[handler] = handler.formatter
handler.formatter = self.basic_formatter

Expand Down Expand Up @@ -522,12 +522,12 @@ def basic(self, debug_level=1, msg=EMPTY_KWARG, *args, **kwargs):
if msg is EMPTY_KWARG:

if self._debugger_level & 1 != 0:
self = self.active or self
other = self.active or self

old_formatters = {}
_acquireLock()
try:
for handler in self.handlers:
for handler in other.handlers:
old_formatters[handler] = handler.formatter
handler.formatter = self.basic_formatter

Expand All @@ -541,12 +541,12 @@ def basic(self, debug_level=1, msg=EMPTY_KWARG, *args, **kwargs):
handler.formatter = formatter

elif self._debugger_level & debug_level != 0:
self = self.active or self
other = self.active or self

old_formatters = {}
_acquireLock()
try:
for handler in self.handlers:
for handler in other.handlers:
old_formatters[handler] = handler.formatter
handler.formatter = self.basic_formatter

Expand All @@ -564,12 +564,12 @@ def basic(self, debug_level=1, msg=EMPTY_KWARG, *args, **kwargs):
if self._debugger_level & 1 != 0:

if msg is EMPTY_KWARG:
self = self.active or self
other = self.active or self

old_formatters = {}
_acquireLock()
try:
for handler in self.handlers:
for handler in other.handlers:
old_formatters[handler] = handler.formatter
handler.formatter = self.basic_formatter

Expand All @@ -583,12 +583,12 @@ def basic(self, debug_level=1, msg=EMPTY_KWARG, *args, **kwargs):
handler.formatter = formatter

else:
self = self.active or self
other = self.active or self

old_formatters = {}
_acquireLock()
try:
for handler in self.handlers:
for handler in other.handlers:
old_formatters[handler] = handler.formatter
handler.formatter = self.basic_formatter

Expand Down Expand Up @@ -936,10 +936,7 @@ def _log(self, level, msg, args, exc_info=None, extra={}, stack_info=False, debu
extra.update( {"debugLevel": debug_level, "tickDifference": self._current_tick - self._last_tick} )

if any( setup_arg in kwargs for setup_arg in changeable_setup_arguments ):
self = self.active or self
_file = self._file
_stream = self._stream

other = self.active or self
new_arguments = dict( self._arguments )

for setup_arg in changeable_setup_arguments:
Expand All @@ -950,7 +947,7 @@ def _log(self, level, msg, args, exc_info=None, extra={}, stack_info=False, debu
old_formatters = {}
_acquireLock()
try:
for handler in self.handlers:
for handler in other.handlers:
old_formatters[handler] = handler.formatter
handler.formatter = new_formatter

Expand All @@ -976,10 +973,7 @@ def _log(self, level, msg, args, exc_info=None, extra={}, stack_info=False, debu
extra.update( {"debugLevel": debug_level, "tickDifference": self._current_tick - self._last_tick} )

if any( setup_arg in kwargs for setup_arg in changeable_setup_arguments ):
self = self.active or self
_file = self._file
_stream = self._stream

other = self.active or self
new_arguments = dict( self._arguments )

for setup_arg in changeable_setup_arguments:
Expand All @@ -990,7 +984,7 @@ def _log(self, level, msg, args, exc_info=None, extra={}, stack_info=False, debu
old_formatters = {}
_acquireLock()
try:
for handler in self.handlers:
for handler in other.handlers:
old_formatters[handler] = handler.formatter
handler.formatter = new_formatter

Expand Down

0 comments on commit cb1f3d4

Please sign in to comment.