diff --git a/common/src/aaredaqlib/face_detection.py b/common/src/aaredaqlib/face_detection.py index 16d52012..af36e59d 100644 --- a/common/src/aaredaqlib/face_detection.py +++ b/common/src/aaredaqlib/face_detection.py @@ -8,7 +8,7 @@ import math from aaredaqlib.logger_config import setup_logger from aaredaqlib.models import MLBoxModel, MLOutputModel -logger = setup_logger(__name__, '/tmp/mxlogs') +logger = setup_logger("aareDAQ") def box_height_from_tuple(box: tuple[float, float, float, float]) -> float: x1, y1, x2, y2 = box diff --git a/daq/src/aaredaq/aaredb.py b/daq/src/aaredaq/aaredb.py index 77ac67b7..8eabe293 100644 --- a/daq/src/aaredaq/aaredb.py +++ b/daq/src/aaredaq/aaredb.py @@ -39,7 +39,7 @@ from aaredaqlib.sample_geometry import SampleGeometryModel from jfjoch_client.models import ScanResult -logger = setup_logger(__name__, "/tmp/mxlogs") +logger = setup_logger("aareDAQ") class AareWrapper: def __init__( diff --git a/daq/src/aaredaq/daq.py b/daq/src/aaredaq/daq.py index 136d0f2f..cc71a2ca 100644 --- a/daq/src/aaredaq/daq.py +++ b/daq/src/aaredaq/daq.py @@ -36,7 +36,7 @@ from aaredaqlib.rotation_scan import RotationScanRequest, CompletedRotationScan from aaredaqlib.sample_geometry import SampleGeometryModel from mxlibs3.jfjoch import JFJochWrapper -logger = setup_logger("aareDAQ", "/tmp/mxlogs") +logger = setup_logger("aareDAQ") class TransformationInvalidException(Exception): def __init__(self, message="Transformation is not implemented"): @@ -49,7 +49,7 @@ class TransformationInvalidException(Exception): class LoopCenteringFailed(Exception): - #logger.error(f"Loop centering failed", extra={"exception:" : Exception}) + logger.error(f"Loop centering failed", extra={"exception:" : Exception}) pass diff --git a/daq/src/aaredaq/workflows.py b/daq/src/aaredaq/workflows.py index 42f1c8ed..61dba91b 100644 --- a/daq/src/aaredaq/workflows.py +++ b/daq/src/aaredaq/workflows.py @@ -10,7 +10,7 @@ from aaredaqlib.logger_config import setup_logger from aaredaqlib.models import StagePositionEnum, SampleCameraSettings, ZoomModeEnum from mxlibs3.mx_lib import pv_wait -logger = setup_logger(__name__, "/tmp/mxlogs") +logger = setup_logger("aareDAQ") def move_bsz(devs: BeamlineDevices, target: float): if abs(target - devs.bsz.position) > 0.1: diff --git a/daq/src/mxlibs3/tell_client.py b/daq/src/mxlibs3/tell_client.py index c7cf68a4..cca97399 100755 --- a/daq/src/mxlibs3/tell_client.py +++ b/daq/src/mxlibs3/tell_client.py @@ -22,7 +22,7 @@ from aareDBclient import ( from aaredaqlib.beamline import MXBeamline # noqa: F401 from mxlibs3.pshell_client import PShellClient -logger = setup_logger(__name__, "/tmp/mxlogs") +logger = setup_logger("aareDAQ") class ManualMountException(Exception): pass diff --git a/gui/src/aaregui/auth.py b/gui/src/aaregui/auth.py index 696d89bc..3e717410 100644 --- a/gui/src/aaregui/auth.py +++ b/gui/src/aaregui/auth.py @@ -6,7 +6,7 @@ from aaredaqlib.models import TokenData from aaredaqlib.logger_config import setup_logger -logger = setup_logger(__name__) +logger = setup_logger('aareDAQ') def auth(base_url: str | None) -> str: curr_user = os.getlogin() diff --git a/gui/src/aaregui/panels/face_detection_panel.py b/gui/src/aaregui/panels/face_detection_panel.py index 7e7e79ad..9721e83c 100644 --- a/gui/src/aaregui/panels/face_detection_panel.py +++ b/gui/src/aaregui/panels/face_detection_panel.py @@ -11,7 +11,7 @@ from aaregui.widgets.title_label import TitleLabel from aaredaqlib.logger_config import setup_logger -logger = setup_logger(__name__) +logger = setup_logger("aareGUI") class FaceDetectionPanel(QWidget): diff --git a/gui/src/aaregui/panels/fluorescence_panel.py b/gui/src/aaregui/panels/fluorescence_panel.py index 7efe64e0..c45e9bf6 100644 --- a/gui/src/aaregui/panels/fluorescence_panel.py +++ b/gui/src/aaregui/panels/fluorescence_panel.py @@ -7,7 +7,7 @@ from PySide6.QtWidgets import QWidget, QGridLayout, QGraphicsSimpleTextItem, QLa from aaredaqlib.logger_config import setup_logger from aaredaqlib.models import FluorescenceSpectrumOutputModel -logger = setup_logger(__name__) +logger = setup_logger("aareGUI") class FluorescencePanel(QWidget): def __init__(self, parent=None): diff --git a/gui/src/aaregui/widgets/camera_image.py b/gui/src/aaregui/widgets/camera_image.py index d5ba14d4..3234eabf 100644 --- a/gui/src/aaregui/widgets/camera_image.py +++ b/gui/src/aaregui/widgets/camera_image.py @@ -30,7 +30,7 @@ from aaredaqlib.sample_geometry import SampleGeometryModel from aaregui.scan_logic.raster_grid_manager import RasterGridManager from aaredaqlib.logger_config import setup_logger -logger = setup_logger(__name__) +logger = setup_logger("aareGUI") class SampleCameraImageState(Enum): IDLE = 0