X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;fp=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fcore%2FCore.java;h=a8d753ebaa1687f7786ce507bdb1b676382a2b6f;hp=c3af217d666f2b9b6c702c364b4e9c3fdb5c507a;hb=d50730f6a330439e0e7ef97ca9329dffe72d5640;hpb=97fe04482ebb8a08e43294acde041c2975cbd8ee

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index c3af217..a8d753e 100644
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -88,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;
@@ -176,6 +177,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 	private volatile long lastConfigurationUpdate;
 
 	private final MetricRegistry metricRegistry;
+	private final Histogram configurationSaveTimeHistogram;
 
 	/**
 	 * Creates a new core.
@@ -207,6 +209,7 @@ public class Core extends AbstractService implements SoneProvider, PostProvider,
 		this.database = database;
 		this.metricRegistry = metricRegistry;
 		preferences = new Preferences(eventBus);
+		this.configurationSaveTimeHistogram = metricRegistry.histogram("configuration.save.duration", () -> new Histogram(new ExponentiallyDecayingReservoir(3000, 0)));
 	}
 
 	//
@@ -631,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;
 	}
@@ -1363,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) {
@@ -1542,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);
@@ -1582,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);
@@ -1597,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);
 	}
@@ -1610,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);
 	}
 
@@ -1624,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;
@@ -1648,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)) {