X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=a8d753ebaa1687f7786ce507bdb1b676382a2b6f;hb=228a168b0430abaded53ee211f83af717cd259f6;hp=71df45bc7dbb02cef72cea1a43c6dad1b10d8b10;hpb=7ab07c330617f5396807cee518a119451a694683;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index 71df45b..a8d753e 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -44,6 +44,7 @@ import java.util.logging.Logger;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import com.codahale.metrics.*;
 import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidAlbumFound;
 import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidImageFound;
 import net.pterodactylus.sone.core.ConfigurationSoneParser.InvalidParentAlbumFound;
@@ -87,6 +88,7 @@ import net.pterodactylus.util.service.AbstractService;
 import net.pterodactylus.util.thread.NamedThreadFactory;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.Stopwatch;
 import com.google.common.collect.FluentIterable;
 import com.google.common.collect.HashMultimap;
 import com.google.common.collect.Multimap;
@@ -174,6 +176,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	/** The time the configuration was last touched. */
 	private volatile long lastConfigurationUpdate;
 
+	private final MetricRegistry metricRegistry;
+	private final Histogram configurationSaveTimeHistogram;
+
 	/**
 	 * Creates a new core.
 	 *
@@ -191,7 +196,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 *            The database
 	 */
 	@Inject
-	public Core(Configuration configuration, FreenetInterface freenetInterface, IdentityManager identityManager, SoneDownloader soneDownloader, ImageInserter imageInserter, UpdateChecker updateChecker, WebOfTrustUpdater webOfTrustUpdater, EventBus eventBus, Database database) {
+	public Core(Configuration configuration, FreenetInterface freenetInterface, IdentityManager identityManager, SoneDownloader soneDownloader, ImageInserter imageInserter, UpdateChecker updateChecker, WebOfTrustUpdater webOfTrustUpdater, EventBus eventBus, Database database, MetricRegistry metricRegistry) {
 		super("Sone Core");
 		this.configuration = configuration;
 		this.freenetInterface = freenetInterface;
@@ -202,7 +207,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		this.webOfTrustUpdater = webOfTrustUpdater;
 		this.eventBus = eventBus;
 		this.database = database;
+		this.metricRegistry = metricRegistry;
 		preferences = new Preferences(eventBus);
+		this.configurationSaveTimeHistogram = metricRegistry.histogram("configuration.save.duration", () -> new Histogram(new ExponentiallyDecayingReservoir(3000, 0)));
 	}
 
 	//
@@ -618,7 +625,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		sone.setLatestEdition(fromNullable(tryParse(property)).or(0L));
 		sone.setClient(new Client("Sone", SonePlugin.getPluginVersion()));
 		sone.setKnown(true);
-		SoneInserter soneInserter = new SoneInserter(this, eventBus, freenetInterface, ownIdentity.getId());
+		SoneInserter soneInserter = new SoneInserter(this, eventBus, freenetInterface, metricRegistry, ownIdentity.getId());
 		soneInserter.insertionDelayChanged(new InsertionDelayChangedEvent(preferences.getInsertionDelay()));
 		eventBus.register(soneInserter);
 		synchronized (soneInserters) {
@@ -627,6 +634,10 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		loadSone(sone);
 		database.storeSone(sone);
 		sone.setStatus(SoneStatus.idle);
+		if (sone.getPosts().isEmpty() && sone.getReplies().isEmpty()) {
+			// dirty hack
+			lockSone(sone);
+		}
 		soneInserter.start();
 		return sone;
 	}
@@ -1359,7 +1370,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		synchronized (soneInserters) {
 			for (Entry<Sone, SoneInserter> soneInserter : soneInserters.entrySet()) {
 				soneInserter.getValue().stop();
-				saveSone(soneInserter.getKey());
+				Sone latestSone = getLocalSone(soneInserter.getKey().getId());
+				saveSone(latestSone);
 			}
 		}
 		synchronized (soneRescuers) {
@@ -1538,7 +1550,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 			database.save();
 
 			/* now save it. */
+			Stopwatch stopwatch = Stopwatch.createStarted();
 			configuration.save();
+			configurationSaveTimeHistogram.update(stopwatch.elapsed(TimeUnit.MICROSECONDS));
 
 		} catch (ConfigurationException ce1) {
 			logger.log(Level.SEVERE, "Could not store configuration!", ce1);
@@ -1578,7 +1592,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 */
 	@Subscribe
 	public void ownIdentityAdded(OwnIdentityAddedEvent ownIdentityAddedEvent) {
-		OwnIdentity ownIdentity = ownIdentityAddedEvent.ownIdentity();
+		OwnIdentity ownIdentity = ownIdentityAddedEvent.getOwnIdentity();
 		logger.log(Level.FINEST, String.format("Adding OwnIdentity: %s", ownIdentity));
 		if (ownIdentity.hasContext("Sone")) {
 			addLocalSone(ownIdentity);
@@ -1593,7 +1607,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 */
 	@Subscribe
 	public void ownIdentityRemoved(OwnIdentityRemovedEvent ownIdentityRemovedEvent) {
-		OwnIdentity ownIdentity = ownIdentityRemovedEvent.ownIdentity();
+		OwnIdentity ownIdentity = ownIdentityRemovedEvent.getOwnIdentity();
 		logger.log(Level.FINEST, String.format("Removing OwnIdentity: %s", ownIdentity));
 		trustedIdentities.removeAll(ownIdentity);
 	}
@@ -1606,9 +1620,9 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 */
 	@Subscribe
 	public void identityAdded(IdentityAddedEvent identityAddedEvent) {
-		Identity identity = identityAddedEvent.identity();
+		Identity identity = identityAddedEvent.getIdentity();
 		logger.log(Level.FINEST, String.format("Adding Identity: %s", identity));
-		trustedIdentities.put(identityAddedEvent.ownIdentity(), identity);
+		trustedIdentities.put(identityAddedEvent.getOwnIdentity(), identity);
 		addRemoteSone(identity);
 	}
 
@@ -1620,7 +1634,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 */
 	@Subscribe
 	public void identityUpdated(IdentityUpdatedEvent identityUpdatedEvent) {
-		Identity identity = identityUpdatedEvent.identity();
+		Identity identity = identityUpdatedEvent.getIdentity();
 		final Sone sone = getRemoteSone(identity.getId());
 		if (sone.isLocal()) {
 			return;
@@ -1644,8 +1658,8 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	 */
 	@Subscribe
 	public void identityRemoved(IdentityRemovedEvent identityRemovedEvent) {
-		OwnIdentity ownIdentity = identityRemovedEvent.ownIdentity();
-		Identity identity = identityRemovedEvent.identity();
+		OwnIdentity ownIdentity = identityRemovedEvent.getOwnIdentity();
+		Identity identity = identityRemovedEvent.getIdentity();
 		trustedIdentities.remove(ownIdentity, identity);
 		for (Entry<OwnIdentity, Collection<Identity>> trustedIdentity : trustedIdentities.asMap().entrySet()) {
 			if (trustedIdentity.getKey().equals(ownIdentity)) {