Skip to content

Commit

Permalink
Rename "sinks" configure option to "handlers"
Browse files Browse the repository at this point in the history
  • Loading branch information
Delgan committed Nov 21, 2018
1 parent da1b0d4 commit f23a94f
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 11 deletions.
8 changes: 4 additions & 4 deletions loguru/_logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,11 @@ def level(self, name, no=None, color=None, icon=None):

return self.level(name)

def configure(self, *, sinks=None, levels=None, extra=None, activation=None):
if sinks is not None:
def configure(self, *, handlers=None, levels=None, extra=None, activation=None):
if handlers is not None:
self.stop()
else:
sinks = []
handlers = []

if levels is not None:
for params in levels:
Expand All @@ -127,7 +127,7 @@ def configure(self, *, sinks=None, levels=None, extra=None, activation=None):
else:
self.disable(name)

return [self.start(**params) for params in sinks]
return [self.start(**params) for params in handlers]

def catch(self, exception=Exception, *, level="ERROR", reraise=False,
message="An error has been caught in function '{record[function]}', "
Expand Down
14 changes: 7 additions & 7 deletions tests/test_configure.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@
from loguru import logger


def test_sinks(capsys, tmpdir):
def test_handlers(capsys, tmpdir):
file = tmpdir.join('test.log')

sinks = [
handlers = [
{'sink': file.realpath(), 'format': 'FileSink: {message}'},
{'sink': sys.stdout, 'format': 'StdoutSink: {message}'},
]

logger.configure(sinks=sinks)
logger.configure(handlers=handlers)
logger.debug('test')

out, err = capsys.readouterr()
Expand Down Expand Up @@ -63,7 +63,7 @@ def test_activation(writer):

def test_dict_unpacking(writer):
config = {
"sinks": [{'sink': writer, 'format': '{level.no} - {extra[x]} {extra[z]} - {message}'}],
"handlers": [{'sink': writer, 'format': '{level.no} - {extra[x]} {extra[z]} - {message}'}],
"levels": [{'name': 'test', 'no': 30}],
"extra": {'x': 1, 'y': 2, 'z': 3},
}
Expand All @@ -77,7 +77,7 @@ def test_dict_unpacking(writer):
assert writer.read() == "30 - 1 3 - Yes!\n"

def test_returned_ids(capsys):
ids = logger.configure(sinks=[
ids = logger.configure(handlers=[
{'sink': sys.stdout, 'format': '{message}'},
{'sink': sys.stderr, 'format': '{message}'},
])
Expand Down Expand Up @@ -112,10 +112,10 @@ def test_dont_reset_by_default(writer):

assert writer.read() == "b 1 Test\n"

def test_reset_previous_sinks(writer):
def test_reset_previous_handlers(writer):
logger.start(writer, format="{message}")

logger.configure(sinks=[])
logger.configure(handlers=[])

logger.debug("Test")

Expand Down

0 comments on commit f23a94f

Please sign in to comment.