From f797a92f87a0e156b2a504aa4861f502ac1e6980 Mon Sep 17 00:00:00 2001 From: Viktor Lofgren Date: Mon, 25 Sep 2023 18:27:04 +0200 Subject: [PATCH] (converter, minor) Use domain name in task heartbeat progress --- .../src/main/java/nu/marginalia/converting/ConverterMain.java | 4 ++-- .../nu/marginalia/converting/sideload/SideloadSource.java | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/ConverterMain.java b/code/processes/converting-process/src/main/java/nu/marginalia/converting/ConverterMain.java index 84b4fb61..3e17022e 100644 --- a/code/processes/converting-process/src/main/java/nu/marginalia/converting/ConverterMain.java +++ b/code/processes/converting-process/src/main/java/nu/marginalia/converting/ConverterMain.java @@ -93,9 +93,9 @@ public class ConverterMain { int i = 0; for (var sideloadSource : sideloadSources) { - logger.info("Sideloading {}", sideloadSource.getDomain()); + logger.info("Sideloading {}", sideloadSource.domainName()); - taskHeartbeat.progress(sideloadSource.getDomain().toString(), i++, sideloadSources.size()); + taskHeartbeat.progress(sideloadSource.domainName(), i++, sideloadSources.size()); writer.write(sideloadSource); } diff --git a/code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/SideloadSource.java b/code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/SideloadSource.java index 445433a0..a74cf456 100644 --- a/code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/SideloadSource.java +++ b/code/processes/converting-process/src/main/java/nu/marginalia/converting/sideload/SideloadSource.java @@ -9,4 +9,8 @@ import java.util.Iterator; public interface SideloadSource { ProcessedDomain getDomain(); Iterator getDocumentsStream(); + + default String domainName() { + return getDomain().domain.toString(); + } }