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

Fix: Display error & stop retrying in case of test frames render error (#289)

Browse Source
This commit is contained in:
Luis Uguina
2020-08-30 00:15:01 +10:00
committed by GitHub
parent 0b53177ab1
commit a119fc2e2d
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -380,15 +380,6 @@ import lombok.Data;
this.noJobRetryIter = 0; this.noJobRetryIter = 0;
ret = this.work(this.renderingJob); ret = this.work(this.renderingJob);
if (ret == Error.Type.RENDERER_KILLED) {
Job frame_to_reset = this.renderingJob; // copy it because the sendError will take ~5min to execute
this.renderingJob = null;
this.gui.error(Error.humanString(ret));
this.sendError(step, frame_to_reset, ret);
this.log.removeCheckPoint(step);
continue;
}
if (ret == Error.Type.NO_SPACE_LEFT_ON_DEVICE) { if (ret == Error.Type.NO_SPACE_LEFT_ON_DEVICE) {
Job frame_to_reset = this.renderingJob; // copy it because the sendError will take ~5min to execute Job frame_to_reset = this.renderingJob; // copy it because the sendError will take ~5min to execute
this.renderingJob = null; this.renderingJob = null;
@@ -404,6 +395,22 @@ import lombok.Data;
this.gui.error(Error.humanString(ret)); this.gui.error(Error.humanString(ret));
this.sendError(step, frame_to_reset, ret); this.sendError(step, frame_to_reset, ret);
this.log.removeCheckPoint(step); this.log.removeCheckPoint(step);
// Initial test frames always have the Job ID below 20. If we have any error while trying to render the initial frame just
// halt the execution
if (Integer.parseInt(frame_to_reset.getId()) < 20) {
// Add the proper explanation to the existing error message and keep the client waiting forever to ensure the user sees the error
this.gui.error(Error.humanString(ret) + " The error happened during the test frame render. Restart the client and try again.");
while (true && !shuttingdown) {
try {
Thread.sleep(1000);
}
catch (InterruptedException e1) {
}
}
break; // if the shutdown signal is triggered then exit the while (this.running == true) loop to initiate the shutdown process
}
continue; continue;
} }