Skip to content

Remove control characters from hyperion logging output #2054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rtuck99 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Remove control characters from hyperion logging output #2054

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 4 additions & 14 deletions src/dodal/log.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from pathlib import Path
from typing import TypedDict

import colorlog
from bluesky.log import logger as bluesky_logger
from graypy import GELFTCPHandler
from ophyd.log import logger as ophyd_logger
Expand All @@ -26,31 +25,22 @@

# Temporarily duplicated https://github.com/bluesky/ophyd-async/issues/550
DEFAULT_FORMAT = (
"%(log_color)s[%(levelname)1.1s %(asctime)s.%(msecs)03d "
"%(module)s:%(lineno)d] %(message)s"
"%(levelname)1.1s %(asctime)s.%(msecs)03d %(module)s:%(lineno)d] %(message)s"
)

DEFAULT_DATE_FORMAT = "%y%m%d %H:%M:%S"

DEFAULT_LOG_COLORS = {
"DEBUG": "cyan",
"INFO": "green",
"WARNING": "yellow",
"ERROR": "red",
"CRITICAL": "red,bg_white",
}


class ColoredFormatterWithDeviceName(colorlog.ColoredFormatter):
class FormatterWithDeviceName(logging.Formatter):
def format(self, record):
message = super().format(record)
if device_name := getattr(record, "ophyd_async_device_name", None):
message = f"[{device_name}]{message}"
return message


DEFAULT_FORMATTER = ColoredFormatterWithDeviceName(
fmt=DEFAULT_FORMAT, datefmt=DEFAULT_DATE_FORMAT, log_colors=DEFAULT_LOG_COLORS
DEFAULT_FORMATTER = FormatterWithDeviceName(
fmt=DEFAULT_FORMAT, datefmt=DEFAULT_DATE_FORMAT
)


Expand Down
Loading