MirrorMirror
/
Signal-Server
mirror of https://github.com/signalapp/Signal-Server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add excessive exception handling in feedback handler 

// FREEBIE
This commit is contained in:
Moxie Marlinspike 2016-04-12 08:48:31 -07:00
parent f9acd6a66b
commit 950bc05d62
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/org/whispersystems/textsecuregcm/push/FeedbackHandler.java
View File

@ -8,7 +8,6 @@ import org.whispersystems.textsecuregcm.storage.Account;
import org.whispersystems.textsecuregcm.storage.AccountsManager; import org.whispersystems.textsecuregcm.storage.AccountsManager;
import org.whispersystems.textsecuregcm.storage.Device; import org.whispersystems.textsecuregcm.storage.Device;
import java.io.IOException;
import java.util.List; import java.util.List;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
@ -45,10 +44,15 @@ public class FeedbackHandler implements Managed, Runnable {
@Override @Override
public void run() { public void run() {
logger.info("Checking Push Server feedback...");
try { try {
List<UnregisteredEvent> gcmFeedback = client.getGcmFeedback(); List<UnregisteredEvent> gcmFeedback = client.getGcmFeedback();
List<UnregisteredEvent> apnFeedback = client.getApnFeedback(); List<UnregisteredEvent> apnFeedback = client.getApnFeedback();
logger.info("Got GCM feedback: " + gcmFeedback.size());
logger.info("Got APN feedback: " + apnFeedback.size());
for (UnregisteredEvent gcmEvent : gcmFeedback) { for (UnregisteredEvent gcmEvent : gcmFeedback) {
handleGcmUnregistered(gcmEvent); handleGcmUnregistered(gcmEvent);
} }
@ -56,8 +60,8 @@ public class FeedbackHandler implements Managed, Runnable {
for (UnregisteredEvent apnEvent : apnFeedback) { for (UnregisteredEvent apnEvent : apnFeedback) {
handleApnUnregistered(apnEvent); handleApnUnregistered(apnEvent);
} }
} catch (IOException e) { } catch (Throwable t) {
logger.warn("Error retrieving feedback: ", e); logger.warn("Error retrieving feedback: ", t);
} }
} }