Merge branch 'early_client_errors_on_connection_issue' into 'master'

Clean working directory after fetching the config

See merge request sheepitrenderfarm/client!111
This commit is contained in:
harlekin
2022-03-13 12:26:11 +00:00

View File

@@ -132,8 +132,6 @@ import okhttp3.HttpUrl;
step = this.log.newCheckPoint(); step = this.log.newCheckPoint();
this.gui.status("Starting"); this.gui.status("Starting");
this.configuration.cleanWorkingDirectory();
Error.Type ret; Error.Type ret;
ret = this.server.getConfiguration(); ret = this.server.getConfiguration();
@@ -163,7 +161,10 @@ import okhttp3.HttpUrl;
} }
}, this.configuration.getShutdownTime()); }, this.configuration.getShutdownTime());
} }
// Check integrity of all files in the working directories
this.configuration.cleanWorkingDirectory();
this.startTime = new Date().getTime(); this.startTime = new Date().getTime();
this.server.start(); // for staying alive this.server.start(); // for staying alive
@@ -509,8 +510,7 @@ import okhttp3.HttpUrl;
OS.getOS().kill(this.renderingJob.getProcessRender().getProcess()); OS.getOS().kill(this.renderingJob.getProcessRender().getProcess());
} }
} }
// this.configuration.workingDirectory.delete();
this.configuration.removeWorkingDirectory(); this.configuration.removeWorkingDirectory();
if (this.server == null) { if (this.server == null) {