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

Merge branch 'fix/error' into 'master'

Browse Source 
Fix: do no desync data on error send

See merge request sheepitrenderfarm/client!233
This commit is contained in:
Sheepit Renderfarm
2023-09-16 06:50:25 +00:00
parent b804567821 c18bd5b1bb
commit ef81e2384b
1 changed files with 1 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/sheepit/client/Client.java
View File

@@ -463,6 +463,7 @@ import okhttp3.HttpUrl;
gui.error("Client::run problem with confirmJob (returned " + ret + ")");
sendError(step, this.renderingJob, Error.Type.VALIDATION_FAILED);
}
this.renderingJob = null;
}
else {
this.gui.status(String.format("Queuing frame for upload (%.2fMB)", (this.renderingJob.getOutputImageSize() / 1024.0 / 1024.0)));
@@ -704,18 +705,6 @@ import okhttp3.HttpUrl;
this.log.debug("Client::sendError Exception " + e + " stacktrace: " + sw.toString());
// no exception should be raised to actual launcher (applet or standalone)
}
if (error != null && (error == Error.Type.RENDERER_CRASHED || error == Error.Type.RENDERER_KILLED_BY_USER || error == Type.OK
|| error == Type.RENDERER_KILLED_BY_USER_OVER_TIME || error == Error.Type.RENDERER_KILLED_BY_SERVER || error == Type.MISSING_SCENE)) {
// do nothing, we can ask for a job right away
}
else {
try {
Thread.sleep(300000); // sleeping for 5min
}
catch (InterruptedException e) {
}
}
}
/**