From 882157b1c5dd4de214b17b77bdfaaea4d5d41937 Mon Sep 17 00:00:00 2001 From: Jamie McClymont Date: Thu, 27 Aug 2020 23:29:37 +1200 Subject: [PATCH] nixos/test: colour machine names --- nixos/lib/test-driver/test-driver.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index 99c6eb06de3c..dc11eaa1982f 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -3,6 +3,7 @@ import argparse import atexit import base64 import io +import itertools import logging import os import pathlib @@ -92,10 +93,17 @@ logging.basicConfig(format="%(message)s") logger = logging.getLogger("test-driver") logger.setLevel(logging.INFO) +machine_colours_iter = ( + "\x1b[{}m".format(x) for x in itertools.cycle(reversed(range(31, 37))) +) + class MachineLogAdapter(logging.LoggerAdapter): def process(self, msg: str, kwargs: Any) -> Tuple[str, Any]: - return f"{self.extra['machine']}: {msg}", kwargs + return ( + f"{self.extra['colour_code']}{self.extra['machine']}\x1b[39m: {msg}", + kwargs, + ) def make_command(args: list) -> str: @@ -172,7 +180,10 @@ class Machine: self.socket = None self.monitor: Optional[socket.socket] = None self.allow_reboot = args.get("allowReboot", False) - self.logger = MachineLogAdapter(logger, extra=dict(machine=self.name)) + self.logger = MachineLogAdapter( + logger, + extra=dict(machine=self.name, colour_code=next(machine_colours_iter)), + ) @staticmethod def create_startcommand(args: Dict[str, str]) -> str: