Fix: error report not sent when no job allocated (#245)

This commit is contained in:
Luis Uguina
2020-06-04 19:50:00 +10:00
committed by GitHub
parent 929e77bbb8
commit 88921a58de

View File

@@ -527,12 +527,18 @@ import lombok.Data;
.append(String.format("%s %.1f GB VRAM\n", conf.getGPUDevice().getModel(), conf.getGPUDevice().getMemory() / 1024.0 / 1024.0 / 1024.0)); .append(String.format("%s %.1f GB VRAM\n", conf.getGPUDevice().getModel(), conf.getGPUDevice().getMemory() / 1024.0 / 1024.0 / 1024.0));
} }
logHeader.append("====================================================================================================\n") logHeader.append("====================================================================================================\n");
.append(String.format("Project ::: %s\n", job_to_reset_.getName())) if (job_to_reset_ != null) {
.append(String.format("Project id: %s frame: %s\n", job_to_reset_.getId(), job_to_reset_.getFrameNumber())) logHeader.append(String.format("Project ::: %s\n", job_to_reset_.getName())).append(String.format("Project id: %s frame: %s\n", job_to_reset_.getId(), job_to_reset_.getFrameNumber()))
.append(String.format("blender ::: %s\n\n", job_to_reset_.getBlenderLongVersion())).append(String.format("ERROR Type :: %s\n", error)) .append(String.format("blender ::: %s\n\n", job_to_reset_.getBlenderLongVersion())).append(String.format("ERROR Type :: %s\n", error));
.append("====================================================================================================\n\n"); }
else {
logHeader.append("Project ::: No project allocated.\n")
.append(String.format("ERROR Type :: %s\n", (error != null ? error : "N/A")));
}
logHeader.append("====================================================================================================\n\n");
// Insert the info at the beginning of the error log
writer.write(logHeader.toString().getBytes()); writer.write(logHeader.toString().getBytes());
ArrayList<String> logs = this.log.getForCheckPoint(step_); ArrayList<String> logs = this.log.getForCheckPoint(step_);