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

Improvement: do not display an error when the server asked to kill a render

Browse Source
This commit is contained in:
Laurent Clouet
2014-12-03 20:09:50 +00:00
parent 8abcde516f
commit 76c8be9e70
4 changed files with 25 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -224,6 +224,11 @@ public class Client {
this.log.debug("Got work to do id: " + this.renderingJob.getId() + " frame: " + this.renderingJob.getFrameNumber());
ret = this.work(this.renderingJob);
if (ret == Error.Type.RENDERER_KILLED) {
this.log.removeCheckPoint(step);
continue;
}
if (ret != Error.Type.OK) {
Job frame_to_reset = this.renderingJob; // copie it because the sendError will take ~5min to execute
this.renderingJob = null;
@@ -280,6 +285,7 @@ public class Client {
if (this.renderingJob != null) {
if (this.renderingJob.getProcess() != null) {
OS.getOS().kill(this.renderingJob.getProcess());
this.renderingJob.setAskForRendererKill(true);
}
}
@@ -633,6 +639,11 @@ public class Client {
if (files.length == 0) {
this.log.error("Client::runRenderer no picture file found (after finished render (namefile_without_extension " + namefile_without_extension + ")");
if (ajob.getAskForRendererKill()) {
this.log.debug("Client::runRenderer renderer didn't generate any frame but it due to a kill request");
return Error.Type.RENDERER_KILLED;
}
String basename = "";
try {
basename = ajob.getPath().substring(0, ajob.getPath().lastIndexOf('.'));