Signal/Signal-Server
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Server synced 2026-04-21 06:18:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Let MessagePersister manage its own worker thread.

Browse Source
This commit is contained in:
Jon Chambers
2020-10-03 10:39:25 -04:00
committed by Jon Chambers
parent 010770904f
commit fc05529574
4 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
View File

@@ -326,7 +326,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
TurnTokenGenerator turnTokenGenerator = new TurnTokenGenerator(config.getTurnConfiguration());
RecaptchaClient recaptchaClient = new RecaptchaClient(config.getRecaptchaConfiguration().getSecret());
MessagePersister clusterMessagePersister = new MessagePersister(messagesCache, messagesManager, accountsManager, recurringJobExecutor, Duration.ofMinutes(config.getMessageCacheConfiguration().getPersistDelayMinutes()));
MessagePersister messagePersister = new MessagePersister(messagesCache, messagesManager, accountsManager, Duration.ofMinutes(config.getMessageCacheConfiguration().getPersistDelayMinutes()));
DirectoryReconciliationClient directoryReconciliationClient = new DirectoryReconciliationClient(config.getDirectoryConfiguration().getDirectoryServerConfiguration());
@@ -347,7 +347,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
environment.lifecycle().manage(accountDatabaseCrawler);
environment.lifecycle().manage(remoteConfigsManager);
environment.lifecycle().manage(messagesCache);
environment.lifecycle().manage(clusterMessagePersister);
environment.lifecycle().manage(messagePersister);
environment.lifecycle().manage(clientPresenceManager);
environment.lifecycle().manage(featureFlagsManager);

40
service/src/main/java/org/whispersystems/textsecuregcm/storage/MessagePersister.java
View File

@@ -11,6 +11,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.whispersystems.textsecuregcm.entities.MessageProtos;
import org.whispersystems.textsecuregcm.util.Constants;
import org.whispersystems.textsecuregcm.util.Util;
import java.time.Duration;
import java.time.Instant;
@@ -31,8 +32,8 @@ public class MessagePersister implements Managed {
private final Duration persistDelay;
private final ScheduledExecutorService scheduledExecutorService;
private ScheduledFuture<?> persistQueuesFuture;
private final Thread workerThread;
private volatile boolean running;
private final MetricRegistry metricRegistry = SharedMetricRegistries.getOrCreate(Constants.METRICS_NAME);
private final Timer getQueuesTimer = metricRegistry.timer(name(MessagePersister.class, "getQueues"));
@@ -48,12 +49,22 @@ public class MessagePersister implements Managed {
private static final Logger logger = LoggerFactory.getLogger(MessagePersister.class);
public MessagePersister(final MessagesCache messagesCache, final MessagesManager messagesManager, final AccountsManager accountsManager, final ScheduledExecutorService scheduledExecutorService, final Duration persistDelay) {
public MessagePersister(final MessagesCache messagesCache, final MessagesManager messagesManager, final AccountsManager accountsManager, final Duration persistDelay) {
this.messagesCache = messagesCache;
this.messagesManager = messagesManager;
this.accountsManager = accountsManager;
this.persistDelay = persistDelay;
this.scheduledExecutorService = scheduledExecutorService;
this.workerThread = new Thread(() -> {
while (running) {
try {
persistNextQueues(Instant.now());
Util.sleep(100);
} catch (final Throwable t) {
logger.warn("Failed to persist queues", t);
}
}
});
}
@VisibleForTesting
@@ -63,23 +74,18 @@ public class MessagePersister implements Managed {
@Override
public void start() {
if (persistQueuesFuture != null) {
persistQueuesFuture.cancel(false);
}
persistQueuesFuture = scheduledExecutorService.scheduleWithFixedDelay(() -> {
try {
persistNextQueues(Instant.now());
} catch (final Exception e) {
logger.warn("Failed to persist queues", e);
}
}, 0, 100, TimeUnit.MILLISECONDS);
running = true;
workerThread.start();
}
@Override
public void stop() {
if (persistQueuesFuture != null) {
persistQueuesFuture.cancel(false);
running = false;
try {
workerThread.join();
} catch (final InterruptedException e) {
logger.warn("Interrupted while waiting for worker thread to complete current operation");
}
}