Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 1 addition & 13 deletions src/murfey/client/contexts/spa_metadata.py
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""
)
Expand Down
5 changes: 4 additions & 1 deletion src/murfey/client/customlogging.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@
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})

Check warning on line 26 in src/murfey/client/customlogging.py

View check run for this annotation

Codecov / codecov/patch

src/murfey/client/customlogging.py#L23-L26

Added lines #L23 - L26 were not covered by tests

def emit(self, record):
try:
Expand Down