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

Merge branch 'fix/shepherd-http500-handle' into 'master'

Browse Source 
Fix: handle http500 response from shepherd

See merge request sheepitrenderfarm/client!147
This commit is contained in:
Sheepit Renderfarm
2022-07-17 13:59:19 +00:00
parent 446224ca85 d359397076
commit 36b506aa6f
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1091,6 +1091,11 @@ import okhttp3.HttpUrl;
confirmJobReturnCode = Type.IMAGE_TOO_LARGE; confirmJobReturnCode = Type.IMAGE_TOO_LARGE;
break retryLoop; break retryLoop;
case ERROR_BAD_RESPONSE:
// set the error and retry on next loop
confirmJobReturnCode = Type.ERROR_BAD_UPLOAD_RESPONSE;
break;
default: default:
// do nothing, try to do a request on the next loop // do nothing, try to do a request on the next loop
break; break;

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

@@ -641,6 +641,9 @@ public class Server extends Thread {
this.log.error(response.body().string()); this.log.error(response.body().string());
return ServerCode.JOB_VALIDATION_IMAGE_TOO_LARGE; return ServerCode.JOB_VALIDATION_IMAGE_TOO_LARGE;
} }
else if (r == HttpURLConnection.HTTP_INTERNAL_ERROR) {
return ServerCode.ERROR_BAD_RESPONSE;
}
else { else {
this.log.error(String.format("Server::HTTPSendFile Unknown response received from server: %s", response.body().string())); this.log.error(String.format("Server::HTTPSendFile Unknown response received from server: %s", response.body().string()));
} }