Raincloud/sheepit-shadow-nabber
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improve waiting messages to show the time of the next retry. (#225)

Browse Source
This commit is contained in:
Luis Uguina
2020-05-16 18:42:16 +10:00
committed by GitHub
parent bd88b2e3dd
commit 642ad86419
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/com/sheepit/client/Client.java
View File

@@ -198,7 +198,7 @@ public class Client {
} }
} }
catch (FermeExceptionNoSession e) { catch (FermeExceptionNoSession e) {
this.log.debug("User has no session need to re-authenticate"); this.log.debug("User has no session and needs to re-authenticate");
ret = this.server.getConfiguration(); ret = this.server.getConfiguration();
if (ret != Error.Type.OK) { if (ret != Error.Type.OK) {
this.renderingJob = null; this.renderingJob = null;
@@ -232,7 +232,8 @@ public class Client {
catch (FermeServerDown e) { catch (FermeServerDown e) {
int wait = ThreadLocalRandom.current().nextInt(10, 30 + 1); // max is exclusive int wait = ThreadLocalRandom.current().nextInt(10, 30 + 1); // max is exclusive
int time_sleep = 1000 * 60 * wait; int time_sleep = 1000 * 60 * wait;
this.gui.status(String.format("Can not connect to server. Please check your connectivity. Will retry in %s minutes", wait)); this.gui.status(String.format("Cannot connect to the server. Please check your connectivity. Will try again at %tR",
new Date(new Date().getTime() + time_sleep)));
try { try {
Thread.sleep(time_sleep); Thread.sleep(time_sleep);
} }
@@ -244,7 +245,8 @@ public class Client {
catch (FermeExceptionServerOverloaded e) { catch (FermeExceptionServerOverloaded e) {
int wait = ThreadLocalRandom.current().nextInt(10, 30 + 1); // max is exclusive int wait = ThreadLocalRandom.current().nextInt(10, 30 + 1); // max is exclusive
int time_sleep = 1000 * 60 * wait; int time_sleep = 1000 * 60 * wait;
this.gui.status(String.format("Server is overloaded and cannot give frame to render. Will retry in %s minutes", wait)); this.gui.status(String.format("The server is overloaded and cannot allocate a job. Will try again at %tR",
new Date(new Date().getTime() + time_sleep)));
try { try {
Thread.sleep(time_sleep); Thread.sleep(time_sleep);
} }
@@ -256,7 +258,8 @@ public class Client {
catch (FermeExceptionServerInMaintenance e) { catch (FermeExceptionServerInMaintenance e) {
int wait = ThreadLocalRandom.current().nextInt(20, 30 + 1); // max is exclusive int wait = ThreadLocalRandom.current().nextInt(20, 30 + 1); // max is exclusive
int time_sleep = 1000 * 60 * wait; int time_sleep = 1000 * 60 * wait;
this.gui.status(String.format("Server is in maintenance and cannot give frame to render. Will retry in %s minutes", wait)); this.gui.status(String.format("The server is under maintenance and cannot allocate a job. Will try again at %tR",
new Date(new Date().getTime() + time_sleep)));
try { try {
Thread.sleep(time_sleep); Thread.sleep(time_sleep);
} }
@@ -268,7 +271,8 @@ public class Client {
catch (FermeExceptionBadResponseFromServer e) { catch (FermeExceptionBadResponseFromServer e) {
int wait = ThreadLocalRandom.current().nextInt(15, 30 + 1); // max is exclusive int wait = ThreadLocalRandom.current().nextInt(15, 30 + 1); // max is exclusive
int time_sleep = 1000 * 60 * wait; int time_sleep = 1000 * 60 * wait;
this.gui.status(String.format("Bad answer from server. Will retry in %s minutes", wait)); this.gui.status(String.format("Bad answer from the server. Will try again at %tR",
new Date(new Date().getTime() + time_sleep)));
try { try {
Thread.sleep(time_sleep); Thread.sleep(time_sleep);
} }
@@ -290,8 +294,8 @@ public class Client {
if (this.renderingJob == null) { // no job if (this.renderingJob == null) { // no job
int wait = ThreadLocalRandom.current().nextInt(10, 30 + 1); // max is exclusive int wait = ThreadLocalRandom.current().nextInt(10, 30 + 1); // max is exclusive
int time_sleep = 1000 * 60 * wait; int time_sleep = 1000 * 60 * wait;
Date wakeup_time = new Date(new Date().getTime() + time_sleep); this.gui.status(String.format("No job available. Will try again at %tR",
this.gui.status(String.format("No job available. Sleeping for %d minutes (will wake up at %tR)", wait, wakeup_time)); new Date(new Date().getTime() + time_sleep)));
this.suspended = true; this.suspended = true;
int time_slept = 0; int time_slept = 0;
while (time_slept < time_sleep && this.running == true) { while (time_slept < time_sleep && this.running == true) {