Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 16 additions & 0 deletions src/picologging/logger.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,11 @@ int Logger_init(Logger *self, PyObject *args, PyObject *kwds)
Py_INCREF(self->name);
self->level = level;

self->enabledForDebug = false;
self->enabledForInfo = false;
self->enabledForWarning = false;
self->enabledForError = false;
self->enabledForCritical = false;
switch (getEffectiveLevel(self)){
case LOG_LEVEL_DEBUG:
self->enabledForDebug = true;
Expand Down Expand Up @@ -124,6 +129,12 @@ PyObject* Logger_setLevel(Logger *self, PyObject *level) {
return NULL;
}
self->level = (unsigned short)PyLong_AsUnsignedLongMask(level);

self->enabledForDebug = false;
self->enabledForInfo = false;
self->enabledForWarning = false;
self->enabledForError = false;
self->enabledForCritical = false;
switch (getEffectiveLevel(self)){
case LOG_LEVEL_DEBUG:
self->enabledForDebug = true;
Expand Down Expand Up @@ -497,6 +508,11 @@ Logger_set_parent(Logger *self, PyObject *value, void *Py_UNUSED(ignored))
Py_XDECREF(self->parent);
self->parent = value;
// Rescan parent levels.
self->enabledForDebug = false;
self->enabledForInfo = false;
self->enabledForWarning = false;
self->enabledForError = false;
self->enabledForCritical = false;
switch (getEffectiveLevel(self)){
case LOG_LEVEL_DEBUG:
self->enabledForDebug = true;
Expand Down
21 changes: 21 additions & 0 deletions tests/unit/test_logger.py
Original file line number Diff line number Diff line change
Expand Up @@ -383,3 +383,24 @@ def test_exception_object_as_exc_info():
result = tmp.getvalue()
assert "message" in result
assert "arghhh!!" in result


def test_logger_setlevel_resets_other_levels():
stream = io.StringIO()
handler = picologging.StreamHandler(stream)
logger = picologging.getLogger("test")
logger.addHandler(handler)
logger.setLevel(picologging.WARNING)

logger.debug("test")
assert stream.getvalue() == ""

logger.warning("test")
assert stream.getvalue() == "test\n"

logger.setLevel(picologging.ERROR)
logger.warning("test")
assert stream.getvalue() == "test\n"

logger.error("test")
assert stream.getvalue() == "test\ntest\n"