diff --git a/src/murfey/client/contexts/spa_metadata.py b/src/murfey/client/contexts/spa_metadata.py index cb388c035..8e5317343 100644 --- a/src/murfey/client/contexts/spa_metadata.py +++ b/src/murfey/client/contexts/spa_metadata.py @@ -271,20 +271,8 @@ def post_transfer( transferred_file, int(gs_name), ) - metadata_source_as_str = ( - "/".join(source.parts[:-2]) - + f"/{environment.visit}/" - + source.parts[-2] - ) - metadata_source = Path( - metadata_source_as_str[1:] - if metadata_source_as_str.startswith("//") - else metadata_source_as_str - ) image_path = ( - _file_transferred_to( - environment, metadata_source, Path(gs_info.image) - ) + _file_transferred_to(environment, source, Path(gs_info.image)) if gs_info.image else "" ) diff --git a/src/murfey/client/customlogging.py b/src/murfey/client/customlogging.py index e1923090e..cd198dabd 100644 --- a/src/murfey/client/customlogging.py +++ b/src/murfey/client/customlogging.py @@ -20,7 +20,10 @@ def prepare(self, record): self.format(record) record_dict = record.__dict__ record_dict["type"] = "log" - return json.dumps(record_dict) + try: + return json.dumps(record_dict) + except TypeError: + return json.dumps({str(k): str(v) for k, v in record_dict.items}) def emit(self, record): try: