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

Switch to GCM CCS and add support for APN feedback processing.

Browse Source
This commit is contained in:
Moxie Marlinspike
2014-07-23 18:00:49 -07:00
parent 362abd618f
commit 4cd098af1d
14 changed files with 735 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/main/java/org/whispersystems/textsecuregcm/storage/StoredMessages.java
View File

@@ -19,9 +19,15 @@ package org.whispersystems.textsecuregcm.storage;
import com.codahale.metrics.Histogram;
import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.SharedMetricRegistries;
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.whispersystems.textsecuregcm.entities.PendingMessage;
import org.whispersystems.textsecuregcm.util.Constants;
import java.io.IOException;
import java.util.LinkedList;
import java.util.List;
@@ -31,9 +37,13 @@ import redis.clients.jedis.JedisPool;
public class StoredMessages {
private static final Logger logger = LoggerFactory.getLogger(StoredMessages.class);
private final MetricRegistry metricRegistry = SharedMetricRegistries.getOrCreate(Constants.METRICS_NAME);
private final Histogram queueSizeHistogram = metricRegistry.histogram(name(getClass(), "queue_size"));
private static final ObjectMapper mapper = new ObjectMapper();
private static final String QUEUE_PREFIX = "msgs";
private final JedisPool jedisPool;
@@ -42,34 +52,42 @@ public class StoredMessages {
this.jedisPool = jedisPool;
}
public void insert(long accountId, long deviceId, String message) {
public void insert(long accountId, long deviceId, PendingMessage message) {
Jedis jedis = null;
try {
jedis = jedisPool.getResource();
long queueSize = jedis.lpush(getKey(accountId, deviceId), message);
String serializedMessage = mapper.writeValueAsString(message);
long queueSize = jedis.lpush(getKey(accountId, deviceId), serializedMessage);
queueSizeHistogram.update(queueSize);
if (queueSize > 1000) {
jedis.ltrim(getKey(accountId, deviceId), 0, 999);
}
} catch (JsonProcessingException e) {
logger.warn("StoredMessages", "Unable to store correctly", e);
} finally {
if (jedis != null)
jedisPool.returnResource(jedis);
}
}
public List<String> getMessagesForDevice(long accountId, long deviceId) {
List<String> messages = new LinkedList<>();
Jedis jedis = null;
public List<PendingMessage> getMessagesForDevice(long accountId, long deviceId) {
List<PendingMessage> messages = new LinkedList<>();
Jedis jedis = null;
try {
jedis = jedisPool.getResource();
String message;
while ((message = jedis.rpop(getKey(accountId, deviceId))) != null) {
messages.add(message);
try {
messages.add(mapper.readValue(message, PendingMessage.class));
} catch (IOException e) {
logger.warn("StoredMessages", "Not a valid PendingMessage", e);
}
}
return messages;