From 998ebc80a1769dc2ec58037465cda4ca625c94a2 Mon Sep 17 00:00:00 2001 From: Viktor Lofgren Date: Mon, 9 Jan 2023 18:23:19 +0100 Subject: [PATCH] Hotfixes (#134) Co-authored-by: vlofgren Co-authored-by: vlofgren Co-authored-by: Viktor Lofgren Reviewed-on: https://git.marginalia.nu/marginalia/marginalia.nu/pulls/134 --- .../marginalia/wmsa/configuration/ServiceDescriptor.java | 3 +++ .../index/postings/forward/ForwardIndexConverter.java | 8 +------- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/marginalia_nu/src/main/java/nu/marginalia/wmsa/configuration/ServiceDescriptor.java b/marginalia_nu/src/main/java/nu/marginalia/wmsa/configuration/ServiceDescriptor.java index 8c472f01..62d57aea 100644 --- a/marginalia_nu/src/main/java/nu/marginalia/wmsa/configuration/ServiceDescriptor.java +++ b/marginalia_nu/src/main/java/nu/marginalia/wmsa/configuration/ServiceDescriptor.java @@ -14,6 +14,7 @@ import nu.marginalia.wmsa.podcasts.PodcastScraperMain; import nu.marginalia.wmsa.renderer.RendererMain; import nu.marginalia.wmsa.resource_store.ResourceStoreMain; import nu.marginalia.wmsa.smhi.scraper.SmhiScraperMain; +import org.apache.logging.log4j.core.lookup.MainMapLookup; import java.util.Map; import java.util.stream.Collectors; @@ -77,6 +78,8 @@ public enum ServiceDescriptor { } public static void main(String... args) { + MainMapLookup.setMainArguments(args); + Map functions = Stream.of( new ListCommand(), new StartCommand(), diff --git a/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/index/postings/forward/ForwardIndexConverter.java b/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/index/postings/forward/ForwardIndexConverter.java index 5edb4fea..c4113440 100644 --- a/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/index/postings/forward/ForwardIndexConverter.java +++ b/marginalia_nu/src/main/java/nu/marginalia/wmsa/edge/index/postings/forward/ForwardIndexConverter.java @@ -49,8 +49,6 @@ public class ForwardIndexConverter { logger.info("Converting {} {}",inputFile, journalReader.fileHeader); - final Path intermediateDocsFile = Files.createTempFile(tmpFileDir, "words-sorted", ".dat"); - try { LongArray docsFileId = getDocIds(outputFileDocsId, journalReader); @@ -74,15 +72,11 @@ public class ForwardIndexConverter { }); docFileData.force(); - - + docsFileId.force(); } catch (IOException ex) { logger.error("Failed to convert", ex); throw ex; } - finally { - Files.deleteIfExists(intermediateDocsFile); - } } private LongArray getDocIds(Path outputFileDocs, SearchIndexJournalReader journalReader) throws IOException {