From 88921a58de663e91c094772a8e47b62eef673646 Mon Sep 17 00:00:00 2001 From: Luis Uguina Date: Thu, 4 Jun 2020 19:50:00 +1000 Subject: [PATCH] Fix: error report not sent when no job allocated (#245) --- src/com/sheepit/client/Client.java | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/src/com/sheepit/client/Client.java b/src/com/sheepit/client/Client.java index 367dd2e..23bccb0 100644 --- a/src/com/sheepit/client/Client.java +++ b/src/com/sheepit/client/Client.java @@ -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)); } - logHeader.append("====================================================================================================\n") - .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("====================================================================================================\n\n"); + logHeader.append("====================================================================================================\n"); + if (job_to_reset_ != null) { + 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)); + } + 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()); ArrayList logs = this.log.getForCheckPoint(step_);