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

Ref: split Job internal attribut in proper context class

Browse Source
This commit is contained in:
Sheepit Renderfarm
2024-11-20 17:43:26 +00:00
parent ce6aa7ecd4
commit e23ae562e8
7 changed files with 456 additions and 361 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/com/sheepit/client/Server.java
View File

@@ -132,7 +132,7 @@ public class Server extends Thread {
if (this.client != null && this.client.getRenderingJob() != null) {
Job job = this.client.getRenderingJob();
urlBuilder.addQueryParameter("frame", job.getFrameNumber()).addQueryParameter("job", job.getId());
urlBuilder.addQueryParameter("frame", job.getRenderSettings().getFrameNumber()).addQueryParameter("job", job.getId());
RenderProcess process = job.getProcessRender();
if (process != null) {
@@ -153,10 +153,10 @@ public class Server extends Thread {
this.log.debug("Server::stayAlive server asked to kill local render process");
// kill the current process, it will generate an error but it's okay
if (this.client != null && this.client.getRenderingJob() != null) {
this.client.getRenderingJob().setServerBlockJob(true);
this.client.getRenderingJob().getRenderState().setServerBlock(true);
if (this.client.getRenderingJob().getProcessRender().getProcess() != null) {
this.client.getRenderingJob().setAskForRendererKill(true);
this.client.getRenderingJob().getRenderState().setAskForRendererKill(true);
this.client.getRenderingJob().getProcessRender().kill();
}
}
@@ -522,10 +522,10 @@ public class Server extends Thread {
LocalDateTime startRequestTime = LocalDateTime.now();
while ((len = is.read(buffer)) != -1) {
if (this.client.getRenderingJob().isServerBlockJob()) {
if (this.client.getRenderingJob().getRenderState().isServerBlock()) {
return Error.Type.RENDERER_KILLED_BY_SERVER;
}
else if (this.client.getRenderingJob().isUserBlockJob()) {
else if (this.client.getRenderingJob().getRenderState().isUserBlock()) {
return Error.Type.RENDERER_KILLED_BY_USER;
}