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

Ref: use more lombok

Browse Source
This commit is contained in:
Sheepit Renderfarm
2024-12-14 14:10:52 +00:00
parent 51885bd4e2
commit f3f6b2431e
6 changed files with 30 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -441,9 +441,9 @@ import okhttp3.HttpUrl;
if (this.renderingJob != null) {
this.gui.status("Stopping");
if (this.renderingJob.getProcessRender().getProcess() != null) {
if (this.renderingJob.getRenderProcess().getProcess() != null) {
this.renderingJob.getRenderState().setAskForRendererKill(true);
this.renderingJob.getProcessRender().kill();
this.renderingJob.getRenderProcess().kill();
}
}
@@ -647,8 +647,8 @@ import okhttp3.HttpUrl;
if (jobToReset != null) {
remoteURL.addQueryParameter("frame", jobToReset.getRenderSettings().getFrameNumber());
remoteURL.addQueryParameter("job", jobToReset.getId());
remoteURL.addQueryParameter("render_time", Integer.toString(jobToReset.getProcessRender().getRenderDuration()));
remoteURL.addQueryParameter("memoryused", Long.toString(jobToReset.getProcessRender().getPeakMemoryUsed()));
remoteURL.addQueryParameter("render_time", Integer.toString(jobToReset.getRenderProcess().getRenderDuration()));
remoteURL.addQueryParameter("memoryused", Long.toString(jobToReset.getRenderProcess().getPeakMemoryUsed()));
}
this.serverRequest.HTTPSendFile(remoteURL.build().toString(), tempFile.getAbsolutePath(), step, this.gui);
tempFile.delete();
@@ -939,8 +939,8 @@ import okhttp3.HttpUrl;
@SuppressWarnings("unused") // Suppress false positive about this.isValidatingJob - PMD rule cannot detect time-sensitive reads
protected Error.Type confirmJob(Job ajob, int checkpoint) {
String urlReal = String.format(LOCALE, "%s&rendertime=%d&preptime=%d&memoryused=%s", ajob.getValidationUrl(), ajob.getProcessRender().getRenderDuration(), ajob.getProcessRender().getScenePrepDuration(),
ajob.getProcessRender().getPeakMemoryUsed());
String urlReal = String.format(LOCALE, "%s&rendertime=%d&preptime=%d&memoryused=%s", ajob.getValidationUrl(), ajob.getRenderProcess().getRenderDuration(), ajob.getRenderProcess().getScenePrepDuration(),
ajob.getRenderProcess().getPeakMemoryUsed());
if (ajob.getRenderOutput().getSpeedSamplesRendered() > 0.0) {
urlReal += String.format(LOCALE, "&speedsamples=%s", ajob.getRenderOutput().getSpeedSamplesRendered());
}