X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FSoneInserter.java;h=fff30529ca655012cb980823c10727a2b52b5c79;hb=195de4860177eebe9264b75736a5d34e46738b0d;hp=e34f19dd5c2be2b3eb42ecf11800d8c0d8ca9c22;hpb=1e9a08c2b73b16dc178437eb8c8025aaa083fcca;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 e34f19d..fff3052 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â2015 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
@@ -19,13 +19,12 @@ package net.pterodactylus.sone.core;
import static java.lang.String.format;
import static java.lang.System.currentTimeMillis;
+import static java.util.concurrent.TimeUnit.*;
import static java.util.logging.Logger.getLogger;
-import static net.pterodactylus.sone.data.Album.NOT_EMPTY;
+import static java.util.stream.Collectors.toList;
+import static net.pterodactylus.sone.data.PostKt.newestFirst;
-import java.io.Closeable;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringWriter;
+import java.io.*;
import java.nio.charset.Charset;
import java.util.HashMap;
import java.util.HashSet;
@@ -35,18 +34,20 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.logging.Level;
import java.util.logging.Logger;
+import com.codahale.metrics.*;
+import com.google.common.base.*;
import net.pterodactylus.sone.core.SoneModificationDetector.LockableFingerprintProvider;
import net.pterodactylus.sone.core.event.InsertionDelayChangedEvent;
import net.pterodactylus.sone.core.event.SoneInsertAbortedEvent;
import net.pterodactylus.sone.core.event.SoneInsertedEvent;
import net.pterodactylus.sone.core.event.SoneInsertingEvent;
-import net.pterodactylus.sone.data.Album;
+import net.pterodactylus.sone.data.AlbumKt;
import net.pterodactylus.sone.data.Post;
import net.pterodactylus.sone.data.Reply;
import net.pterodactylus.sone.data.Sone;
import net.pterodactylus.sone.data.Sone.SoneStatus;
+import net.pterodactylus.sone.data.SoneKt;
import net.pterodactylus.sone.main.SonePlugin;
-import net.pterodactylus.util.io.Closer;
import net.pterodactylus.util.service.AbstractService;
import net.pterodactylus.util.template.HtmlFilter;
import net.pterodactylus.util.template.ReflectionAccessor;
@@ -58,9 +59,6 @@ import net.pterodactylus.util.template.TemplateParser;
import net.pterodactylus.util.template.XmlFilter;
import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Charsets;
-import com.google.common.base.Optional;
-import com.google.common.collect.FluentIterable;
import com.google.common.collect.Ordering;
import com.google.common.eventbus.EventBus;
import com.google.common.eventbus.Subscribe;
@@ -73,8 +71,6 @@ import freenet.support.io.ArrayBucket;
/**
* A Sone inserter is responsible for inserting a Sone if it has changed.
- *
- * @author David âBombeâ Roden
*/
public class SoneInserter extends AbstractService {
@@ -106,8 +102,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.
@@ -121,34 +120,37 @@ public class SoneInserter extends AbstractService {
* @param soneId
* The ID of the Sone to insert
*/
- public SoneInserter(final Core core, EventBus eventBus, FreenetInterface freenetInterface, final String soneId) {
- this(core, eventBus, freenetInterface, 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() {
- final Optional sone = core.getSone(soneId);
- if (!sone.isPresent()) {
+ Sone sone = core.getSone(soneId);
+ if (sone == null) {
return false;
}
- return core.isLocked(sone.get());
+ return core.isLocked(sone);
}
@Override
public String getFingerprint() {
- final Optional sone = core.getSone(soneId);
- if (!sone.isPresent()) {
+ Sone sone = core.getSone(soneId);
+ if (sone == null) {
return null;
}
- return sone.get().getFingerprint();
+ return sone.getFingerprint();
}
}, insertionDelay), 1000);
}
@VisibleForTesting
- SoneInserter(Core core, EventBus eventBus, FreenetInterface freenetInterface, 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", () -> 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;
@@ -219,12 +221,11 @@ public class SoneInserter extends AbstractService {
sleep(delay);
if (soneModificationDetector.isEligibleForInsert()) {
- Optional soneOptional = core.getSone(soneId);
- if (!soneOptional.isPresent()) {
+ Sone sone = core.getSone(soneId);
+ if (sone == null) {
logger.log(Level.WARNING, format("Sone %s has disappeared, exiting inserter.", soneId));
return;
}
- Sone sone = soneOptional.get();
InsertInformation insertInformation = new InsertInformation(sone);
logger.log(Level.INFO, String.format("Inserting Sone â%sââ¦", sone.getName()));
@@ -233,8 +234,11 @@ public class SoneInserter extends AbstractService {
sone.setStatus(SoneStatus.inserting);
long insertTime = currentTimeMillis();
eventBus.post(new SoneInsertingEvent(sone));
- FreenetURI finalUri = freenetInterface.insertDirectory(sone.getInsertUri(), insertInformation.generateManifestEntries(), "index.html");
- eventBus.post(new SoneInsertedEvent(sone, currentTimeMillis() - insertTime, insertInformation.getFingerprint()));
+ Stopwatch stopwatch = Stopwatch.createStarted();
+ 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()));
/* at this point we might already be stopped. */
if (shouldStop()) {
/* if so, bail out, donât change anything. */
@@ -246,6 +250,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 {
@@ -282,14 +287,12 @@ public class SoneInserter extends AbstractService {
* Container for information that are required to insert a Sone. This
* container merely exists to copy all relevant data without holding a lock
* on the {@link Sone} object for too long.
- *
- * @author David âBombeâ Roden
*/
@VisibleForTesting
class InsertInformation implements Closeable {
/** All properties of the Sone, copied for thread safety. */
- private final Map soneProperties = new HashMap();
+ private final Map soneProperties = new HashMap<>();
private final String fingerprint;
private final ManifestCreator manifestCreator;
@@ -301,17 +304,16 @@ public class SoneInserter extends AbstractService {
*/
public InsertInformation(Sone sone) {
this.fingerprint = sone.getFingerprint();
- Map soneProperties = new HashMap();
+ Map soneProperties = new HashMap<>();
soneProperties.put("id", sone.getId());
soneProperties.put("name", sone.getName());
soneProperties.put("time", currentTimeMillis());
- soneProperties.put("requestUri", sone.getRequestUri());
soneProperties.put("profile", sone.getProfile());
- soneProperties.put("posts", Ordering.from(Post.TIME_COMPARATOR).sortedCopy(sone.getPosts()));
+ soneProperties.put("posts", Ordering.from(newestFirst()).sortedCopy(sone.getPosts()));
soneProperties.put("replies", Ordering.from(Reply.TIME_COMPARATOR).reverse().sortedCopy(sone.getReplies()));
- soneProperties.put("likedPostIds", new HashSet(sone.getLikedPostIds()));
- soneProperties.put("likedReplyIds", new HashSet(sone.getLikedReplyIds()));
- soneProperties.put("albums", FluentIterable.from(sone.getRootAlbum().getAlbums()).transformAndConcat(Album.FLATTENER).filter(NOT_EMPTY).toList());
+ soneProperties.put("likedPostIds", new HashSet<>(sone.getLikedPostIds()));
+ soneProperties.put("likedReplyIds", new HashSet<>(sone.getLikedReplyIds()));
+ soneProperties.put("albums", SoneKt.getAllAlbums(sone).stream().filter(AlbumKt.notEmpty()::invoke).collect(toList()));
manifestCreator = new ManifestCreator(core, soneProperties);
}
@@ -334,7 +336,7 @@ public class SoneInserter extends AbstractService {
* @return The manifest entries for the Sone insert
*/
public HashMap generateManifestEntries() {
- HashMap manifestEntries = new HashMap();
+ HashMap manifestEntries = new HashMap<>();
/* first, create an index.html. */
manifestEntries.put("index.html", manifestCreator.createManifestElement(
@@ -358,15 +360,13 @@ public class SoneInserter extends AbstractService {
/**
* Creates manifest elements for an insert by rendering a template.
- *
- * @author David âBombeâ Roden
*/
@VisibleForTesting
static class ManifestCreator implements Closeable {
private final Core core;
private final Map soneProperties;
- private final Set buckets = new HashSet();
+ private final Set buckets = new HashSet<>();
ManifestCreator(Core core, Map soneProperties) {
this.core = core;
@@ -374,37 +374,28 @@ public class SoneInserter extends AbstractService {
}
public ManifestElement createManifestElement(String name, String contentType, String templateName) {
- InputStreamReader templateInputStreamReader = null;
- InputStream templateInputStream = null;
Template template;
- try {
- templateInputStream = getClass().getResourceAsStream(templateName);
- templateInputStreamReader = new InputStreamReader(templateInputStream, utf8Charset);
+ try (InputStream templateInputStream = getClass().getResourceAsStream(templateName);
+ InputStreamReader templateInputStreamReader = new InputStreamReader(templateInputStream, utf8Charset)) {
template = TemplateParser.parse(templateInputStreamReader);
- } catch (TemplateException te1) {
- logger.log(Level.SEVERE, String.format("Could not parse template â%sâ!", templateName), te1);
+ } catch (IOException | TemplateException e1) {
+ logger.log(Level.SEVERE, String.format("Could not parse template â%sâ!", templateName), e1);
return null;
- } finally {
- Closer.close(templateInputStreamReader);
- Closer.close(templateInputStream);
}
TemplateContext templateContext = templateContextFactory.createTemplateContext();
templateContext.set("core", core);
templateContext.set("currentSone", soneProperties);
templateContext.set("currentEdition", core.getUpdateChecker().getLatestEdition());
- templateContext.set("version", SonePlugin.VERSION);
- StringWriter writer = new StringWriter();
- try {
+ templateContext.set("version", SonePlugin.getPluginVersion());
+ try (StringWriter writer = new StringWriter()) {
template.render(templateContext, writer);
RandomAccessBucket bucket = new ArrayBucket(writer.toString().getBytes(Charsets.UTF_8));
buckets.add(bucket);
return new ManifestElement(name, bucket, contentType, bucket.size());
- } catch (TemplateException te1) {
- logger.log(Level.SEVERE, String.format("Could not render template â%sâ!", templateName), te1);
+ } catch (IOException | TemplateException e1) {
+ logger.log(Level.SEVERE, String.format("Could not render template â%sâ!", templateName), e1);
return null;
- } finally {
- Closer.close(writer);
}
}