TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-23 18:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check job requirements are satisfied in between retry iterations.

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2014-10-21 13:50:38 -07:00
parent 4cdc0a3e61
commit c3eb0ea9db
2 changed files with 34 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
jobqueue/src/main/java/org/whispersystems/jobqueue/Job.java
View File

@ -26,6 +26,7 @@ public abstract class Job implements Serializable {
private final JobParameters parameters; private final JobParameters parameters;
private transient long persistentId; private transient long persistentId;
private transient int runIteration;
public Job(JobParameters parameters) { public Job(JobParameters parameters) {
this.parameters = parameters; this.parameters = parameters;
@ -71,6 +72,14 @@ public abstract class Job implements Serializable {
return persistentId; return persistentId;
} }
public int getRunIteration() {
return runIteration;
}
public void setRunIteration(int runIteration) {
this.runIteration = runIteration;
}
public abstract void onAdded(); public abstract void onAdded();
public abstract void onRun() throws Throwable; public abstract void onRun() throws Throwable;
public abstract void onCanceled(); public abstract void onCanceled();

26
jobqueue/src/main/java/org/whispersystems/jobqueue/JobConsumer.java
View File

@ -20,6 +20,12 @@ import org.whispersystems.jobqueue.persistence.PersistentStorage;
public class JobConsumer extends Thread { public class JobConsumer extends Thread {
enum JobResult {
SUCCESS,
FAILURE,
DEFERRED
}
private final JobQueue jobQueue; private final JobQueue jobQueue;
private final PersistentStorage persistentStorage; private final PersistentStorage persistentStorage;
@ -34,13 +40,17 @@ public class JobConsumer extends Thread {
while (true) { while (true) {
Job job = jobQueue.getNext(); Job job = jobQueue.getNext();
if (!runJob(job)) { JobResult result;
if ((result = runJob(job)) != JobResult.DEFERRED) {
if (result == JobResult.FAILURE) {
job.onCanceled(); job.onCanceled();
} }
if (job.isPersistent()) { if (job.isPersistent()) {
persistentStorage.remove(job.getPersistentId()); persistentStorage.remove(job.getPersistentId());
} }
}
if (job.getGroupId() != null) { if (job.getGroupId() != null) {
jobQueue.setGroupIdAvailable(job.getGroupId()); jobQueue.setGroupIdAvailable(job.getGroupId());
@ -48,21 +58,25 @@ public class JobConsumer extends Thread {
} }
} }
private boolean runJob(Job job) { private JobResult runJob(Job job) {
int retryCount = job.getRetryCount(); int retryCount = job.getRetryCount();
int runIteration = job.getRunIteration();
for (int i=retryCount;i>0;i--) { for (;runIteration<retryCount;runIteration++) {
try { try {
job.onRun(); job.onRun();
return true; return JobResult.SUCCESS;
} catch (Throwable throwable) { } catch (Throwable throwable) {
if (!job.onShouldRetry(throwable)) { if (!job.onShouldRetry(throwable)) {
return false; return JobResult.FAILURE;
} else if (!job.isRequirementsMet()) {
job.setRunIteration(runIteration+1);
return JobResult.DEFERRED;
} }
} }
} }
return false; return JobResult.FAILURE;
} }
} }