Skip to content

Commit

Permalink
Rename "logger.stop()" to "logger.clear()"
Browse files Browse the repository at this point in the history
  • Loading branch information
Delgan committed Nov 7, 2017
1 parent 041f209 commit 116311c
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
4 changes: 2 additions & 2 deletions loguru/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@ def __call__(self, *args, **kwargs):

@functools.wraps(function)
def catch_wrapper(*args, **kwargs):
# TODO: Check it could be any conflict with multiprocessing because of self modification
# TODO: Fix it to avoid any conflict with threading because of self modification
self.function_name = function_name
self.exception_logger = self.logger._exception_catcher
with self:
Expand Down Expand Up @@ -713,7 +713,7 @@ def log_to(self, sink, *, level=DEBUG, format=VERBOSE_FORMAT, filter=None, color

return self.handlers_count - 1

def stop(self, handler_id=None):
def clear(self, handler_id=None):
if handler_id is None:
for sink, _ in self.handlers.values():
if hasattr(sink, 'stop') and callable(sink.stop):
Expand Down
2 changes: 1 addition & 1 deletion tests/test_catch_wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def c():

result_with = writer.read()

logger.stop()
logger.clear()
writer.clear()

logger.log_to(writer, better_exceptions=False)
Expand Down
16 changes: 8 additions & 8 deletions tests/test_stop.py → tests/test_clear.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
message = 'some message'
expected = message + '\n'

def test_stop_all(tmpdir, writer, capsys, logger):
def test_clear_all(tmpdir, writer, capsys, logger):
file = tmpdir.join("test.log")

logger.debug("This shouldn't be printed.")
Expand All @@ -15,7 +15,7 @@ def test_stop_all(tmpdir, writer, capsys, logger):

logger.debug(message)

logger.stop()
logger.clear()

logger.debug("This shouldn't be printed neither.")

Expand All @@ -26,21 +26,21 @@ def test_stop_all(tmpdir, writer, capsys, logger):
assert err == expected
assert writer.read() == expected

def test_stop_count(logger, writer):
n = logger.stop()
def test_clear_count(logger, writer):
n = logger.clear()
assert n == 0

n = logger.stop(42)
n = logger.clear(42)
assert n == 0

i = logger.log_to(writer)
n = logger.stop(i)
n = logger.clear(i)
assert n == 1

logger.log_to(writer)
logger.log_to(writer)
n = logger.stop()
n = logger.clear()
assert n == 2

n = logger.stop(0)
n = logger.clear(0)
assert n == 0
2 changes: 1 addition & 1 deletion tests/test_exceptions.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def compare(compare_outputs, request):
cfg_loguru = ('import sys;'
'sys.path.append("' + loguru_path + '");'
'from loguru import logger;'
'logger.stop();'
'logger.clear();'
'logger.log_to(sys.stdout, better_exceptions=False, colored=False, format="{message}")\n')

def compare(template, caught_scope_index, caught_trace_index=0, *, disabled=[]):
Expand Down
2 changes: 1 addition & 1 deletion tests/test_log_to_options.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ def test_better_exceptions_option(logger, writer):
logger.exception('')
result_with = writer.read().strip()

logger.stop()
logger.clear()
writer.clear()

logger.log_to(writer, format='{message}', better_exceptions=False)
Expand Down
2 changes: 1 addition & 1 deletion tests/test_log_to_sinks.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ def log(sink, rep=1):
i = logger.log_to(sink, format='{message}')
for _ in range(rep):
logger.debug(message)
logger.stop(i)
logger.clear(i)
logger.debug("This shouldn't be printed neither.")

@repetitions
Expand Down
4 changes: 2 additions & 2 deletions tests/test_rotation.py
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ def test_compression_rotation(tmpdir, logger):

for i in range(10):
logger.debug(str(i))
logger.stop(n)
logger.clear(n)

assert tmpdir.join('test.log').read() == '9\n'

Expand All @@ -333,7 +333,7 @@ def test_compression_without_rotation(tmpdir, logger):
import gzip
n = logger.log_to(tmpdir.join('test.log'), compression=True, format='{message}')
logger.debug("Test")
logger.stop(n)
logger.clear(n)

assert len(tmpdir.listdir()) == 1
archive = tmpdir.join('test.log.gz')
Expand Down

0 comments on commit 116311c

Please sign in to comment.