-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
version 1.16.4
- Loading branch information
Showing
6 changed files
with
114 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
import logging | ||
import time | ||
|
||
|
||
class ResolvableErrorLogger: | ||
def __init__( | ||
self, | ||
logger: logging.Logger, | ||
error_level: int = logging.ERROR, | ||
resolved_level: int = logging.INFO, | ||
min_interval: int = 600, | ||
): | ||
"""Logging for resolvable errors. | ||
Args: | ||
logger: Logger to use. | ||
error_level: Log level for error. | ||
resolved_level: Log level for resolved message. | ||
min_interval: Minimum interval between error logs in seconds. | ||
""" | ||
self._log = logger | ||
self._error_level = error_level | ||
self._resolved_level = resolved_level | ||
self._min_interval = min_interval | ||
self._time_of_last_error = 0 | ||
self._last_error_message = "" | ||
|
||
def error(self, msg: str, *args, **kwargs) -> None: | ||
"""Log an error message.""" | ||
|
||
# we log, if last message is old enough or text changed | ||
if self._time_of_last_error - time.time() > self._min_interval or msg != self._last_error_message: | ||
self._log.log(self._error_level, msg, *args, **kwargs) | ||
|
||
# store it | ||
self._time_of_last_error = time.time() | ||
self._last_error_message = msg | ||
|
||
def resolve(self, msg: str, *args, **kwargs): | ||
"""Resolve an error.""" | ||
|
||
# only log, if we had an actual error | ||
if self._time_of_last_error > 0: | ||
self._log.log(self._resolved_level, msg, *args, **kwargs) | ||
|
||
# reset | ||
self._time_of_last_error = 0 | ||
self._last_error_message = "" | ||
|
||
|
||
__all__ = ["ResolvableErrorLogger"] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,7 @@ | ||
[tool.poetry] | ||
name = "pyobs-core" | ||
packages = [{ include = "pyobs" }] | ||
version = "1.16.3" | ||
version = "1.16.4" | ||
description = "robotic telescope software" | ||
authors = ["Tim-Oliver Husser <[email protected]>"] | ||
license = "MIT" | ||
|
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
import logging | ||
|
||
from pyobs.utils.logging.resolvableerror import ResolvableErrorLogger | ||
|
||
|
||
def create_logger(): | ||
# create logger | ||
logger = logging.getLogger("test_logger") | ||
logger.setLevel(logging.DEBUG) | ||
|
||
# create console handler and set level to debug | ||
ch = logging.StreamHandler() | ||
ch.setLevel(logging.DEBUG) | ||
|
||
# create formatter | ||
formatter = logging.Formatter("%(levelname)s - %(message)s") | ||
|
||
# add formatter to ch | ||
ch.setFormatter(formatter) | ||
|
||
# add ch to logger | ||
logger.addHandler(ch) | ||
return logger | ||
|
||
|
||
def test_logger(capsys): | ||
# init | ||
logger = create_logger() | ||
rel = ResolvableErrorLogger(logger) | ||
|
||
# logging resolve should do nothing | ||
rel.resolve("Resolve") | ||
_, err = capsys.readouterr() | ||
assert err == "" | ||
|
||
# logging error gives the error message | ||
rel.error("Some error") | ||
_, err = capsys.readouterr() | ||
assert "ERROR - Some error" in err | ||
|
||
# Same should give nothing | ||
rel.error("Some error") | ||
_, err = capsys.readouterr() | ||
assert err == "" | ||
|
||
# logging new error gives the error message | ||
rel.error("Some new error") | ||
_, err = capsys.readouterr() | ||
assert "ERROR - Some new error" in err | ||
|
||
# logging resolve should output | ||
rel.resolve("Resolved") | ||
_, err = capsys.readouterr() | ||
assert "INFO - Resolved" in err |