X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=ba13305ece57da63139239fa564689dfd5ebb2b3;hb=76f80f2904bc44149bda93e7c93e90568f2e4a80;hp=af180a03c9ccf166233014efca6819be7c042b91;hpb=aa83028a17a61b8a2103475fae4624fbfe4c9ca5;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
index af180a0..ba13305 100644
--- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
+++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java
@@ -1,5 +1,5 @@
 /*
- * Sone - SoneInserter.java - Copyright © 2010–2019 David Roden
+ * Sone - SoneInserter.java - Copyright © 2010–2020 David Roden
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -32,7 +32,6 @@ import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
-import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -106,9 +105,11 @@ public class SoneInserter extends AbstractService {
 	private final FreenetInterface freenetInterface;
 
 	private final SoneModificationDetector soneModificationDetector;
+	private final SoneUriCreator soneUriCreator;
 	private final long delay;
 	private final String soneId;
 	private final Histogram soneInsertDurationHistogram;
+	private final Meter soneInsertErrorMeter;
 
 	/**
 	 * Creates a new Sone inserter.
@@ -122,8 +123,8 @@ public class SoneInserter extends AbstractService {
 	 * @param soneId
 	 *            The ID of the Sone to insert
 	 */
-	public SoneInserter(final Core core, EventBus eventBus, FreenetInterface freenetInterface, MetricRegistry metricRegistry, final String soneId) {
-		this(core, eventBus, freenetInterface, metricRegistry, soneId, new SoneModificationDetector(new LockableFingerprintProvider() {
+	public SoneInserter(final Core core, EventBus eventBus, FreenetInterface freenetInterface, MetricRegistry metricRegistry, SoneUriCreator soneUriCreator, final String soneId) {
+		this(core, eventBus, freenetInterface, metricRegistry, soneUriCreator, soneId, new SoneModificationDetector(new LockableFingerprintProvider() {
 			@Override
 			public boolean isLocked() {
 				Sone sone = core.getSone(soneId);
@@ -145,12 +146,14 @@ public class SoneInserter extends AbstractService {
 	}
 
 	@VisibleForTesting
-	SoneInserter(Core core, EventBus eventBus, FreenetInterface freenetInterface, MetricRegistry metricRegistry, String soneId, SoneModificationDetector soneModificationDetector, long delay) {
+	SoneInserter(Core core, EventBus eventBus, FreenetInterface freenetInterface, MetricRegistry metricRegistry, SoneUriCreator soneUriCreator, String soneId, SoneModificationDetector soneModificationDetector, long delay) {
 		super("Sone Inserter for “" + soneId + "”", false);
 		this.core = core;
 		this.eventBus = eventBus;
 		this.freenetInterface = freenetInterface;
-		this.soneInsertDurationHistogram = metricRegistry.histogram("sone.insert.duration");
+		this.soneInsertDurationHistogram = metricRegistry.histogram("sone.insert.duration", () -> new Histogram(new ExponentiallyDecayingReservoir(3000, 0)));
+		this.soneInsertErrorMeter = metricRegistry.meter("sone.insert.errors");
+		this.soneUriCreator = soneUriCreator;
 		this.soneId = soneId;
 		this.soneModificationDetector = soneModificationDetector;
 		this.delay = delay;
@@ -235,7 +238,7 @@ public class SoneInserter extends AbstractService {
 						long insertTime = currentTimeMillis();
 						eventBus.post(new SoneInsertingEvent(sone));
 						Stopwatch stopwatch = Stopwatch.createStarted();
-						FreenetURI finalUri = freenetInterface.insertDirectory(sone.getInsertUri(), insertInformation.generateManifestEntries(), "index.html");
+						FreenetURI finalUri = freenetInterface.insertDirectory(soneUriCreator.getInsertUri(sone), insertInformation.generateManifestEntries(), "index.html");
 						stopwatch.stop();
 						soneInsertDurationHistogram.update(stopwatch.elapsed(MICROSECONDS));
 						eventBus.post(new SoneInsertedEvent(sone, stopwatch.elapsed(MILLISECONDS), insertInformation.getFingerprint()));
@@ -250,6 +253,7 @@ public class SoneInserter extends AbstractService {
 						success = true;
 						logger.log(Level.INFO, String.format("Inserted Sone “%s” at %s.", sone.getName(), finalUri));
 					} catch (SoneException se1) {
+						soneInsertErrorMeter.mark();
 						eventBus.post(new SoneInsertAbortedEvent(sone, se1));
 						logger.log(Level.WARNING, String.format("Could not insert Sone “%s”!", sone.getName()), se1);
 					} finally {