mx-bluesky 1.1.0__py3-none-any.whl → 1.4.0__py3-none-any.whl

mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_Mapping_py3v1.py

@@ -4,13 +4,8 @@ Chip mapping utilities for fixed target
 This version changed to python3 March2020 by RLO
 """
 
-import logging
-import time
-
 import numpy as np
-from matplotlib import pyplot as plt
 
-from mx_bluesky.beamlines.i24.serial import log
 from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import ChipType
 from mx_bluesky.beamlines.i24.serial.fixed_target.i24ssx_Chip_StartUp_py3v1 import (
     check_files,
@@ -19,19 +14,12 @@ from mx_bluesky.beamlines.i24.serial.fixed_target.i24ssx_Chip_StartUp_py3v1 impo
     read_parameter_file,
     write_file,
 )
+from mx_bluesky.beamlines.i24.serial.log import SSX_LOGGER, log_on_entry
 from mx_bluesky.beamlines.i24.serial.parameters import get_chip_format
 from mx_bluesky.beamlines.i24.serial.parameters.constants import PARAM_FILE_PATH_FT
 
-logger = logging.getLogger("I24ssx.chip_mapping")
-
-
-def setup_logging():
-    # Log should now change name daily.
-    logfile = time.strftime("i24_%Y_%m_%d.log").lower()
-    log.config(logfile)
 
-
-@log.log_on_entry
+@log_on_entry
 def read_file_make_dict(fid, chip_type, switch=False):
     a_dict = {}
     b_dict = {}
@@ -52,8 +40,8 @@ def read_file_make_dict(fid, chip_type, switch=False):
         return a_dict
 
 
-@log.log_on_entry
-def plot_file(fid, chip_type):
+@log_on_entry
+def plot_file(plt, fid, chip_type):
     chip_dict = read_file_make_dict(fid, chip_type)
     x_list, y_list, z_list = [], [], []
     for k in sorted(chip_dict.keys()):
@@ -84,7 +72,7 @@ def plot_file(fid, chip_type):
     return 1
 
 
-@log.log_on_entry
+@log_on_entry
 def convert_chip_to_hex(fid, chip_type):
     chip_dict = read_file_make_dict(fid, chip_type, True)
     chip_format = get_chip_format(ChipType(chip_type))
@@ -93,14 +81,14 @@ def convert_chip_to_hex(fid, chip_type):
         # Normal
         if chip_type in [ChipType.Oxford, ChipType.OxfordInner]:
             shot_order_list = get_shot_order(chip_type)
-            logger.info("Shot Order List: \n")
-            logger.info(f"{shot_order_list[:14]}")
-            logger.info(f"{shot_order_list[-14:]}")
+            SSX_LOGGER.info("Shot Order List: \n")
+            SSX_LOGGER.info(f"{shot_order_list[:14]}")
+            SSX_LOGGER.info(f"{shot_order_list[-14:]}")
             for i, k in enumerate(shot_order_list):
                 if i % 20 == 0:
-                    logger.info("\n")
+                    SSX_LOGGER.info("\n")
                 else:
-                    logger.info(f"{k}")
+                    SSX_LOGGER.info(f"{k}")
             sorted_pres_list = []
             for addr in shot_order_list:
                 sorted_pres_list.append(chip_dict[addr])
@@ -124,38 +112,39 @@ def convert_chip_to_hex(fid, chip_type):
                 pvar = 5001 + i
                 line = f"P{pvar}=${hex_string}"
                 g.write(line + "\n")
-                logger.info("hex string: %s" % (hex_string + 4 * "0"))
-                logger.info(f"line number= {i}")
-                logger.info(
+                SSX_LOGGER.info("hex string: %s" % (hex_string + 4 * "0"))
+                SSX_LOGGER.info(f"line number= {i}")
+                SSX_LOGGER.info(
                     "right_list: \n{}\n".format("".join(str(x) for x in right_list))
                 )
-                logger.info(f"PVAR: {line}")
+                SSX_LOGGER.info(f"PVAR: {line}")
                 if (i + 1) % windows_per_block == 0:
-                    logger.info(
+                    SSX_LOGGER.info(
                         "\n %s" % (40 * (" %i" % ((i / windows_per_block) + 2)))
                     )
-            logger.info(f"hex_length: {hex_length}")
+            SSX_LOGGER.info(f"hex_length: {hex_length}")
         else:
-            logger.warning("Chip type unknown, no conversion done.")
+            SSX_LOGGER.warning("Chip type unknown, no conversion done.")
     return 0
 
 
-def main():
-    setup_logging()
+def main(plt):
     params = read_parameter_file()
 
     check_files("i24", [".spec"])
     write_file(suffix=".spec", order="shot")
 
-    logger.info(f"PARAMETER PATH = {PARAM_FILE_PATH_FT}")
+    SSX_LOGGER.info(f"PARAMETER PATH = {PARAM_FILE_PATH_FT}")
     fid = PARAM_FILE_PATH_FT / f"{params.filename}.spec"
-    logger.info(f"FID = {fid}")
+    SSX_LOGGER.info(f"FID = {fid}")
 
-    plot_file(fid, params.chip.chip_type.value)
+    plot_file(plt, fid, params.chip.chip_type.value)
     convert_chip_to_hex(fid, params.chip.chip_type.value)
 
 
 if __name__ == "__main__":
-    main()
+    from matplotlib import pyplot as plt
+
+    main(plt)
     plt.show()
-plt.close()
+    plt.close()

mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_Chip_StartUp_py3v1.py

@@ -2,7 +2,6 @@
 Startup utilities for chip
 """
 
-import logging
 import os
 import string
 import time
@@ -10,8 +9,8 @@ from pathlib import Path
 
 import numpy as np
 
-from mx_bluesky.beamlines.i24.serial import log
 from mx_bluesky.beamlines.i24.serial.fixed_target.ft_utils import ChipType
+from mx_bluesky.beamlines.i24.serial.log import SSX_LOGGER, log_on_entry
 from mx_bluesky.beamlines.i24.serial.parameters import (
     FixedTargetParameters,
     get_chip_format,
@@ -22,14 +21,6 @@ from mx_bluesky.beamlines.i24.serial.parameters.constants import (
     PARAM_FILE_PATH_FT,
 )
 
-logger = logging.getLogger("I24ssx.chip_startup")
-
-
-def setup_logging():
-    # Log should now change name daily.
-    logfile = time.strftime("i24fixedtarget_%d%B%y.log").lower()
-    log.config(logfile)
-
 
 def read_parameter_file(
     param_path: Path | str = PARAM_FILE_PATH_FT,
@@ -41,16 +32,16 @@ def read_parameter_file(
     return params
 
 
-@log.log_on_entry
+@log_on_entry
 def fiducials(chip_type: int):
     fiducial_list: list | None = None
     if chip_type in [ChipType.Oxford, ChipType.OxfordInner, ChipType.Minichip]:
         fiducial_list = []
     elif chip_type == ChipType.Custom:
         # No fiducial for custom
-        logger.warning("No fiducials for custom chip")
+        SSX_LOGGER.warning("No fiducials for custom chip")
     else:
-        logger.warning(f"Unknown chip_type, {chip_type}, in fiducials")
+        SSX_LOGGER.warning(f"Unknown chip_type, {chip_type}, in fiducials")
     return fiducial_list
 
 
@@ -118,9 +109,9 @@ def pathli(l_in=None, way="typewriter", reverse=False):
                 for _ in range(25):
                     long_list.append(entry)
         else:
-            logger.warning(f"No known path, way =  {way}")
+            SSX_LOGGER.warning(f"No known path, way =  {way}")
     else:
-        logger.warning("No list written")
+        SSX_LOGGER.warning("No list written")
     return long_list
 
 
@@ -154,11 +145,11 @@ def get_alphanumeric(chip_type: ChipType):
     for block in block_list:
         for window in window_list:
             alphanumeric_list.append(block + "_" + window)
-    logger.info(f"Length of alphanumeric list = {len(alphanumeric_list)}")
+    SSX_LOGGER.info(f"Length of alphanumeric list = {len(alphanumeric_list)}")
     return alphanumeric_list
 
 
-@log.log_on_entry
+@log_on_entry
 def get_shot_order(chip_type: ChipType):
     cell_format = get_chip_format(chip_type)
     blk_num = cell_format.x_blocks
@@ -192,11 +183,11 @@ def get_shot_order(chip_type: ChipType):
                 count = 0
                 switch = 0
 
-    logger.info(f"Length of collect list = {len(collect_list)}")
+    SSX_LOGGER.info(f"Length of collect list = {len(collect_list)}")
     return collect_list
 
 
-@log.log_on_entry
+@log_on_entry
 def write_file(
     location: str = "i24",
     suffix: str = ".addr",
@@ -208,7 +199,7 @@ def write_file(
         params = read_parameter_file(param_file_path)
     else:
         msg = f"Unknown location, {location}"
-        logger.error(msg)
+        SSX_LOGGER.error(msg)
         raise ValueError(msg)
     chip_file_path = save_path / f"chips/{params.directory}/{params.filename}{suffix}"
 
@@ -235,10 +226,10 @@ def write_file(
             line = "\t".join([xtal_name, str(x), str(y), "0.0", pres]) + "\n"
             g.write(line)
 
-    logger.info(f"Write {chip_file_path} completed")
+    SSX_LOGGER.info(f"Write {chip_file_path} completed")
 
 
-@log.log_on_entry
+@log_on_entry
 def check_files(
     location: str,
     suffix_list: list[str],
@@ -249,7 +240,7 @@ def check_files(
         params = read_parameter_file(param_file_path)
     else:
         msg = f"Unknown location, {location}"
-        logger.error(msg)
+        SSX_LOGGER.error(msg)
         raise ValueError(msg)
     chip_file_path = save_path / f"chips/{params.directory}/{params.filename}"
 
@@ -265,12 +256,12 @@ def check_files(
                 full_fid.parent / f"{time_str}_{params.filename}{full_fid.suffix}"
             )
             # FIXME hack / fix. Actually move the file
-            logger.info(f"File {full_fid} Already Exists")
-    logger.debug("Check files done")
+            SSX_LOGGER.info(f"File {full_fid} Already Exists")
+    SSX_LOGGER.debug("Check files done")
     return 1
 
 
-@log.log_on_entry
+@log_on_entry
 def write_headers(
     location: str,
     suffix_list: list[str],
@@ -305,24 +296,23 @@ def write_headers(
                 )
     else:
         msg = f"Unknown location, {location}"
-        logger.error(msg)
+        SSX_LOGGER.error(msg)
         raise ValueError(msg)
-    logger.debug("Write headers done")
+    SSX_LOGGER.debug("Write headers done")
 
 
 def run():
-    logger.debug("Run Startup")
+    SSX_LOGGER.debug("Run Startup")
     check_files("i24", [".addr", ".shot"])
-    logger.info("Checked Files")
+    SSX_LOGGER.info("Checked Files")
     write_headers("i24", [".addr", ".shot"])
-    logger.info("Written Headers")
-    logger.info("Writing to Files has been disabled. Headers Only")
+    SSX_LOGGER.info("Written Headers")
+    SSX_LOGGER.info("Writing to Files has been disabled. Headers Only")
     # Makes a file with random crystal positions
     check_files("i24", ["rando.spec"])
     write_headers("i24", ["rando.spec"])
-    logger.debug("StartUp Done")
+    SSX_LOGGER.debug("StartUp Done")
 
 
 if __name__ == "__main__":
-    setup_logging()
     run()

mx_bluesky/beamlines/i24/serial/fixed_target/i24ssx_moveonclick.py

@@ -28,27 +28,31 @@ def _get_beam_centre(oav: OAV):
     Args:
         oav (OAV): the OAV device.
     """
-    return oav.parameters.beam_centre_i, oav.parameters.beam_centre_j
+    beam_x = yield from bps.rd(oav.beam_centre_i)
+    beam_y = yield from bps.rd(oav.beam_centre_j)
+    return beam_x, beam_y
 
 
 def _calculate_zoom_calibrator(oav: OAV):
     """Set the scale for the zoom calibrator for the pmac moves."""
-    currentzoom = yield from bps.rd(oav.zoom_controller.percentage)
+    currentzoom = yield from bps.rd(oav.zoom_controller.percentage)  # type: ignore # See: https://github.com/bluesky/bluesky/issues/1809
     zoomcalibrator = 1.547 - (0.03 * currentzoom) + (0.0001634 * currentzoom**2)
     return zoomcalibrator
 
 
 def _move_on_mouse_click_plan(
-    oav: OAV, pmac: PMAC, beam_centre: Sequence[int], clicked_position: Sequence[int]
+    oav: OAV,
+    pmac: PMAC,
+    clicked_position: Sequence[int],
 ):
     """A plan that calculates the zoom calibrator and moves to the clicked \
         position coordinates.
     """
     zoomcalibrator = yield from _calculate_zoom_calibrator(oav)
-    beamX, beamY = beam_centre
+    beamX, beamY = yield from _get_beam_centre(oav)
     x, y = clicked_position
     xmove = -1 * (beamX - x) * zoomcalibrator
-    ymove = -1 * (beamY - y) * zoomcalibrator
+    ymove = 1 * (beamY - y) * zoomcalibrator
     logger.info(f"Moving X and Y {xmove} {ymove}")
     xmovepmacstring = "#1J:" + str(xmove)
     ymovepmacstring = "#2J:" + str(ymove)
@@ -62,14 +66,13 @@ def onMouse(event, x, y, flags, param):
         RE = param[0]
         pmac = param[1]
         oav = param[2]
-        beamX, beamY = _get_beam_centre(oav)
         logger.info(f"Clicked X and Y {x} {y}")
-        RE(_move_on_mouse_click_plan(oav, pmac, (beamX, beamY), (x, y)))
+        RE(_move_on_mouse_click_plan(oav, pmac, (x, y)))
 
 
-def update_ui(oav, frame):
+def update_ui(oav, frame, RE):
     # Get beam x and y values
-    beamX, beamY = _get_beam_centre(oav)
+    beamX, beamY = RE(_get_beam_centre(oav)).plan_result
 
     # Overlay text and beam centre
     cv.ellipse(
@@ -164,7 +167,7 @@ def start_viewer(oav: OAV, pmac: PMAC, RE: RunEngine, oav1: str = OAV1_CAM):
     while success:
         success, frame = cap.read()
 
-        update_ui(oav, frame)
+        update_ui(oav, frame, RE)
 
         k = cv.waitKey(1)
         if k == 113:  # Q
@@ -212,7 +215,7 @@ def start_viewer(oav: OAV, pmac: PMAC, RE: RunEngine, oav1: str = OAV1_CAM):
 
 
 if __name__ == "__main__":
-    RE = RunEngine()
+    RE = RunEngine(call_returns_result=True)
     # Get devices out of dodal
     oav: OAV = i24.oav()
     pmac: PMAC = i24.pmac()

mx_bluesky/beamlines/i24/serial/log.py

@@ -1,39 +1,30 @@
 import functools
 import logging
 import logging.config
+import time
 from os import environ
 from pathlib import Path
 
-from dodal.log import (
-    ERROR_LOG_BUFFER_LINES,
-    integrate_bluesky_and_ophyd_logging,
-    set_up_all_logging_handlers,
-)
+import bluesky.plan_stubs as bps
+from blueapi.core import MsgGenerator
+from bluesky.log import logger as bluesky_logger
+from dodal.log import DEFAULT_GRAYLOG_PORT, ophyd_async_logger
 from dodal.log import LOGGER as dodal_logger
 
-VISIT_PATH = Path("/dls_sw/i24/etc/ssx_current_visit.txt")
-
-
-class OphydDebugFilter(logging.Filter):  # NOTE yet to be fully tested
-    """Do not send ophyd debug log messages to stream handler."""
+from mx_bluesky.common.utils.log import do_default_logging_setup
 
-    def filter(self, record):
-        return "ophyd" not in record.getMessage().lower()
+VISIT_PATH = Path("/dls_sw/i24/etc/ssx_current_visit.txt")
 
 
 # Logging set up
-logger = logging.getLogger("I24ssx")
-logger.addHandler(logging.NullHandler())
-logger.parent = dodal_logger
+SSX_LOGGER = logging.getLogger("I24serial")
+SSX_LOGGER.addHandler(logging.NullHandler())
+SSX_LOGGER.parent = dodal_logger
+
 
 logging_config = {
     "version": 1,
     "disable_existing_loggers": False,
-    "filters": {
-        "ophyd_filter": {
-            "()": OphydDebugFilter,
-        }
-    },
     "formatters": {
         "default": {
             "class": "logging.Formatter",
@@ -42,18 +33,17 @@ logging_config = {
     },
     "handlers": {
         "console": {
-            "level": "DEBUG",
+            "level": "INFO",
             "class": "logging.StreamHandler",
             "formatter": "default",
-            "filters": ["ophyd_filter"],
             "stream": "ext://sys.stdout",
         }
     },
     "loggers": {
-        "I24ssx": {
+        "I24serial": {
             "handlers": ["console"],
             "level": "DEBUG",
-            "propagate": True,
+            "propagate": False,
         }
     },
 }
@@ -68,10 +58,8 @@ def _read_visit_directory_from_file() -> Path:
 
 
 def _get_logging_file_path() -> Path:
-    """Get the path to write the artemis log files to.
-    If on a beamline, this will be written to the according area depending on the
-    BEAMLINE envrionment variable. If no envrionment variable is found it will default
-    it to the tmp/dev directory.
+    """Get the path to write the serial experiment specific log file to.
+    If on a beamline, this will be written to the tmp folder in the current visit.
     Returns:
         logging_path (Path): Path to the log file for the file handler to write to.
     """
@@ -87,24 +75,11 @@ def _get_logging_file_path() -> Path:
     return logging_path
 
 
-def default_logging_setup(dev_mode: bool = False):
-    """ Default log setup for i24 serial.
-
-    - Set up handlers for parent logger (from dodal)
-    - integrate bluesky and ophyd loggers
-    - Remove dodal stream handler to avoid double messages (for now, use only the \
-        i24ssx default stream to keep the output expected by the scientists.)
-    """
-    handlers = set_up_all_logging_handlers(  # noqa: F841
-        dodal_logger,
-        _get_logging_file_path(),
-        "dodal.log",
-        dev_mode,
-        ERROR_LOG_BUFFER_LINES,
-    )
-    integrate_bluesky_and_ophyd_logging(dodal_logger)
-    # Remove dodal StreamHandler to avoid duplication of messages above debug
-    dodal_logger.removeHandler(dodal_logger.handlers[0])
+def _integrate_bluesky_logs(parent_logger: logging.Logger):
+    # Integrate only bluesky and ophyd_async logger
+    for log in [bluesky_logger, ophyd_async_logger]:
+        log.parent = parent_logger
+        log.setLevel(logging.DEBUG)
 
 
 def config(
@@ -124,7 +99,15 @@ def config(
         dev_mode (bool, optional): If true, will log to graylog on localhost instead \
             of production. Defaults to False.
     """
-    default_logging_setup(dev_mode=dev_mode)
+    do_default_logging_setup(
+        "mx-bluesky.log",
+        DEFAULT_GRAYLOG_PORT,
+        dev_mode=dev_mode,
+        integrate_all_logs=False,
+    )
+    # Remove dodal StreamHandler to avoid duplication of messages above debug
+    dodal_logger.removeHandler(dodal_logger.handlers[0])
+    _integrate_bluesky_logs(dodal_logger)
 
     if logfile:
         logs = _get_logging_file_path() / logfile
@@ -135,14 +118,40 @@ def config(
         FH = logging.FileHandler(logs, mode=write_mode, encoding="utf-8", delay=delayed)
         FH.setLevel(logging.DEBUG)
         FH.setFormatter(fileFormatter)
-        logger.addHandler(FH)
+        SSX_LOGGER.addHandler(FH)
 
 
 def log_on_entry(func):
     @functools.wraps(func)
     def decorator(*args, **kwargs):
         name = func.__name__
-        logger.debug(f"Running {name} ")
+        SSX_LOGGER.debug(f"Running {name} ")
         return func(*args, **kwargs)
 
     return decorator
+
+
+def setup_collection_logs(expt: str, dev_mode: bool = False) -> MsgGenerator:
+    """A small plan to set up the logging from blueapi on start up as we're running \
+        on procserv.
+        This setup will likely change once the beamline has a cluster.
+    """
+    if (
+        expt == "Serial Fixed"
+    ):  # SSXType.FIXED: See https://github.com/DiamondLightSource/mx-bluesky/issues/608
+        logfile = time.strftime("i24fixedtarget_%d%B%y.log").lower()
+    else:
+        logfile = time.strftime("i24extruder_%d%B%y.log").lower()
+
+    config(logfile, dev_mode=dev_mode)
+    yield from bps.null()
+
+
+def clean_up_log_config_at_end() -> MsgGenerator:
+    """A small plan for blueapi to tidy up logging configuration."""
+    # See https://github.com/DiamondLightSource/mx-bluesky/issues/609
+    for handler in SSX_LOGGER.handlers:
+        SSX_LOGGER.removeHandler(handler)
+    for handler in dodal_logger.handlers:
+        dodal_logger.removeHandler(handler)
+    yield from bps.null()

mx_bluesky/beamlines/i24/serial/parameters/fixed_target/cs/cs_maker.json

@@ -1,8 +1,8 @@
 {
-    "scalex": 10004.0,
-    "scaley": 10005.2,
+    "scalex": 10004.7,
+    "scaley": 10004.4,
     "scalez": 10000.0,
-    "skew": -0.01,
+    "skew": 0.120,
     "Sx_dir": 1,
     "Sy_dir": 1,
     "Sz_dir": 1

mx_bluesky/beamlines/i24/serial/run_extruder.sh

@@ -1,19 +1,44 @@
 #!/bin/bash
 
+NO_PROCESERV_TEST=false
+
+case "$2" in
+    -t | --test)
+        echo "Will run serial in test mode without procserv."
+        NO_PROCESERV_TEST=true
+        ;;
+esac
+
+
 # Get edm path from input
 edm_path=$1
 
 # Get the directory of this script
 current=$( realpath "$( dirname "$0" )" )
 
-# Run script to start blueapi serve
-. $current/start_blueapi.sh
+if [[ $NO_PROCESERV_TEST == true ]]; then
+    echo "Start the blueapi sever"
+
+    # Run script to start blueapi serve
+    . $current/start_blueapi.sh
+fi
+
+echo "Set up logging configuration"
+blueapi -c "${current}/blueapi_config.yaml" controller run setup_collection_logs '{"expt":"Serial Jet"}'
 
 # Open the edm screen for an extruder serial collection
 echo "Starting extruder edm screen."
 edm -x "${edm_path}/EX-gui/DiamondExtruder-I24-py3v1.edl"
 
-echo "Edm screen closed, bye!"
+echo "Edm screen closed"
+
+echo "Clean up log configuration"
+blueapi -c "${current}/blueapi_config.yaml" controller run clean_up_log_config_at_end
+
+if [[ $NO_PROCESERV_TEST == true ]]; then
+    # In this case blueapi server needs to be killed.
+    pgrep blueapi | xargs kill
+    echo "Blueapi process killed"
+fi
 
-pgrep blueapi | xargs kill
-echo "Blueapi process killed"
+echo "All done, bye!"

mx_bluesky/beamlines/i24/serial/run_fixed_target.sh

@@ -1,22 +1,46 @@
 #!/bin/bash
 
+NO_PROCESERV_TEST=false
+
+case "$2" in
+    -t | --test)
+        echo "Will run serial in test mode without procserv."
+        NO_PROCESERV_TEST=true
+        ;;
+esac
+
 # Get edm path from input
 edm_path=$1
 
 # Export env variable for the stages edm to work properly
 export EDMDATAFILES="/dls_sw/prod/R3.14.12.3/support/motor/6-7-1dls14/motorApp/opi/edl"
 
-# Get the directory of this script
-current=$( realpath "$( dirname "$0" )" )
+if [[ $NO_PROCESERV_TEST == true ]]; then
+    echo "Start the blueapi sever"
+
+    # Get the directory of this script
+    current=$( realpath "$( dirname "$0" )" )
 
-# Run script to start blueapi serve
-. $current/start_blueapi.sh
+    # Run script to start blueapi serve
+    . $current/start_blueapi.sh
+fi
+
+echo "Set up logging configuration"
+blueapi -c "${current}/blueapi_config.yaml" controller run setup_collection_logs '{"expt":"Serial Fixed"}'
 
 # Open the edm screen for a fixed target serial collection
 echo "Starting fixed target edm screen."
 edm -x "${edm_path}/FT-gui/DiamondChipI24-py3v1.edl"
 
-echo "Edm screen closed, bye!"
+echo "Edm screen closed"
+
+echo "Clean up log configuration"
+blueapi -c "${current}/blueapi_config.yaml" controller run clean_up_log_config_at_end
+
+if [[ $NO_PROCESERV_TEST == true ]]; then
+    # In this case blueapi server needs to be killed.
+    pgrep blueapi | xargs kill
+    echo "Blueapi process killed"
+fi
 
-pgrep blueapi | xargs kill
-echo "Blueapi process killed"
+echo "All done, bye!"