mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Guarantee backoff

This commit is contained in:
M66B 2020-09-20 16:48:04 +02:00
parent ab8b9657b3
commit 3dfaa44e89
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/eu/faircode/email/Core.java
View File

@ -4053,6 +4053,7 @@ class Core {
static class State { static class State {
private int backoff; private int backoff;
private boolean backingoff = false;
private ConnectionHelper.NetworkState networkState; private ConnectionHelper.NetworkState networkState;
private Thread thread = new Thread(); private Thread thread = new Thread();
private Semaphore semaphore = new Semaphore(0); private Semaphore semaphore = new Semaphore(0);
@ -4097,11 +4098,19 @@ class Core {
return true; return true;
} }
boolean acquire(long milliseconds) throws InterruptedException { boolean acquire(long milliseconds, boolean backoff) throws InterruptedException {
return semaphore.tryAcquire(milliseconds, TimeUnit.MILLISECONDS); try {
backingoff = backoff;
return semaphore.tryAcquire(milliseconds, TimeUnit.MILLISECONDS);
} finally {
backingoff = false;
}
} }
void error(Throwable ex) { void error(Throwable ex) {
if (backingoff)
return;
if (ex instanceof MessagingException && if (ex instanceof MessagingException &&
("connection failure".equals(ex.getMessage()) || ("connection failure".equals(ex.getMessage()) ||
"Not connected".equals(ex.getMessage()) || // POP3 "Not connected".equals(ex.getMessage()) || // POP3

10
app/src/main/java/eu/faircode/email/ServiceSynchronize.java
View File

@ -899,7 +899,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
try { try {
long backoff = RECONNECT_BACKOFF - ago; long backoff = RECONNECT_BACKOFF - ago;
EntityLog.log(ServiceSynchronize.this, account.name + " reconnect backoff=" + (backoff / 1000)); EntityLog.log(ServiceSynchronize.this, account.name + " reconnect backoff=" + (backoff / 1000));
state.acquire(backoff); state.acquire(backoff, true);
} catch (InterruptedException ex) { } catch (InterruptedException ex) {
Log.w(account.name + " backoff " + ex.toString()); Log.w(account.name + " backoff " + ex.toString());
} }
@ -1523,7 +1523,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
try { try {
wlAccount.release(); wlAccount.release();
state.acquire(2 * duration); state.acquire(2 * duration, false);
Log.i("### " + account.name + " keeping alive"); Log.i("### " + account.name + " keeping alive");
} catch (InterruptedException ex) { } catch (InterruptedException ex) {
EntityLog.log(this, account.name + " waited state=" + state); EntityLog.log(this, account.name + " waited state=" + state);
@ -1638,7 +1638,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
if (cbackoff > backoff) { if (cbackoff > backoff) {
try { try {
EntityLog.log(this, account.name + " reconnect backoff=" + cbackoff); EntityLog.log(this, account.name + " reconnect backoff=" + cbackoff);
state.acquire(cbackoff * 1000L); state.acquire(cbackoff * 1000L, true);
} catch (InterruptedException ex) { } catch (InterruptedException ex) {
Log.w(account.name + " cbackoff " + ex.toString()); Log.w(account.name + " cbackoff " + ex.toString());
} }
@ -1648,7 +1648,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
if (backoff <= CONNECT_BACKOFF_MAX) { if (backoff <= CONNECT_BACKOFF_MAX) {
// Short back-off period, keep device awake // Short back-off period, keep device awake
try { try {
state.acquire(backoff * 1000L); state.acquire(backoff * 1000L, true);
} catch (InterruptedException ex) { } catch (InterruptedException ex) {
Log.w(account.name + " backoff " + ex.toString()); Log.w(account.name + " backoff " + ex.toString());
} }
@ -1681,7 +1681,7 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
try { try {
wlAccount.release(); wlAccount.release();
state.acquire(2 * backoff * 1000L); state.acquire(2 * backoff * 1000L, true);
Log.i("### " + account.name + " backoff done"); Log.i("### " + account.name + " backoff done");
} catch (InterruptedException ex) { } catch (InterruptedException ex) {
Log.w(account.name + " backoff " + ex.toString()); Log.w(account.name + " backoff " + ex.toString());