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

Handle new protocole value

Browse Source
This commit is contained in:
Laurent Clouet
2020-10-10 10:52:39 +02:00
parent 330f2c6fd8
commit 70d7dc052c
2 changed files with 50 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/sheepit/client/Client.java
View File

@@ -949,6 +949,7 @@ import lombok.Data;
confirmJobReturnCode = Error.Type.SESSION_DISABLED; confirmJobReturnCode = Error.Type.SESSION_DISABLED;
break retryLoop; break retryLoop;
case JOB_VALIDATION_ERROR_IMAGE_WRONG_DIMENSION:
case JOB_VALIDATION_ERROR_MISSING_PARAMETER: case JOB_VALIDATION_ERROR_MISSING_PARAMETER:
// no point to retry the request // no point to retry the request
confirmJobReturnCode = Error.Type.UNKNOWN; confirmJobReturnCode = Error.Type.UNKNOWN;

63
src/com/sheepit/client/Error.java
View File

@@ -22,11 +22,34 @@ package com.sheepit.client;
public class Error { public class Error {
public enum Type { public enum Type {
// id have to be kept synchronised with the server side. // id have to be kept synchronised with the server side.
OK(0), UNKNOWN(99), WRONG_CONFIGURATION(1), AUTHENTICATION_FAILED(2), TOO_OLD_CLIENT(3), SESSION_DISABLED(4), RENDERER_NOT_AVAILABLE( OK(0),
5), MISSING_RENDERER(6), MISSING_SCENE(7), NOOUTPUTFILE(8), IMAGE_TOO_LARGE(26), DOWNLOAD_FILE(9), CAN_NOT_CREATE_DIRECTORY(10), NETWORK_ISSUE(11), RENDERER_CRASHED( UNKNOWN(99),
12), RENDERER_CRASHED_PYTHON_ERROR(24), RENDERER_OUT_OF_VIDEO_MEMORY(13), RENDERER_OUT_OF_MEMORY(21), RENDERER_KILLED( WRONG_CONFIGURATION(1),
14), RENDERER_KILLED_BY_USER(20), RENDERER_KILLED_BY_USER_OVER_TIME(23), RENDERER_KILLED_BY_SERVER(22), RENDERER_MISSING_LIBRARIES( AUTHENTICATION_FAILED(2),
15), FAILED_TO_EXECUTE(16), OS_NOT_SUPPORTED(17), CPU_NOT_SUPPORTED(18), GPU_NOT_SUPPORTED(19), VALIDATION_FAILED(25), TOO_OLD_CLIENT(3),
SESSION_DISABLED(4),
RENDERER_NOT_AVAILABLE(5),
MISSING_RENDERER(6),
MISSING_SCENE(7),
NOOUTPUTFILE(8),
IMAGE_TOO_LARGE(26),
DOWNLOAD_FILE(9),
CAN_NOT_CREATE_DIRECTORY(10),
NETWORK_ISSUE(11),
RENDERER_CRASHED(12),
RENDERER_CRASHED_PYTHON_ERROR(24),
RENDERER_OUT_OF_VIDEO_MEMORY(13),
RENDERER_OUT_OF_MEMORY(21),
RENDERER_KILLED(14),
RENDERER_KILLED_BY_USER(20),
RENDERER_KILLED_BY_USER_OVER_TIME(23),
RENDERER_KILLED_BY_SERVER(22),
RENDERER_MISSING_LIBRARIES(15),
FAILED_TO_EXECUTE(16),
OS_NOT_SUPPORTED(17),
CPU_NOT_SUPPORTED(18),
GPU_NOT_SUPPORTED(19),
VALIDATION_FAILED(25),
// internal error handling // internal error handling
NO_SPACE_LEFT_ON_DEVICE(100), ERROR_BAD_RESPONSE(101), NO_SPACE_LEFT_ON_DEVICE(100), ERROR_BAD_RESPONSE(101),
@@ -44,19 +67,31 @@ public class Error {
} }
public enum ServerCode { public enum ServerCode {
OK(0), UNKNOWN(999), OK(0),
UNKNOWN(999),
CONFIGURATION_ERROR_NO_CLIENT_VERSION_GIVEN(100), CONFIGURATION_ERROR_CLIENT_TOO_OLD(101), CONFIGURATION_ERROR_AUTH_FAILED( CONFIGURATION_ERROR_NO_CLIENT_VERSION_GIVEN(100),
102), CONFIGURATION_ERROR_WEB_SESSION_EXPIRED(103), CONFIGURATION_ERROR_MISSING_PARAMETER(104), CONFIGURATION_ERROR_CLIENT_TOO_OLD(101),
CONFIGURATION_ERROR_AUTH_FAILED(102),
CONFIGURATION_ERROR_WEB_SESSION_EXPIRED(103),
CONFIGURATION_ERROR_MISSING_PARAMETER(104),
JOB_REQUEST_NOJOB(200), JOB_REQUEST_ERROR_NO_RENDERING_RIGHT(201), JOB_REQUEST_ERROR_DEAD_SESSION(202), JOB_REQUEST_ERROR_SESSION_DISABLED( JOB_REQUEST_NOJOB(200),
203), JOB_REQUEST_ERROR_INTERNAL_ERROR(204), JOB_REQUEST_ERROR_RENDERER_NOT_AVAILABLE(205), JOB_REQUEST_SERVER_IN_MAINTENANCE( JOB_REQUEST_ERROR_NO_RENDERING_RIGHT(201),
206), JOB_REQUEST_SERVER_OVERLOADED(207), JOB_REQUEST_ERROR_DEAD_SESSION(202),
JOB_REQUEST_ERROR_SESSION_DISABLED(203),
JOB_REQUEST_ERROR_INTERNAL_ERROR(204),
JOB_REQUEST_ERROR_RENDERER_NOT_AVAILABLE(205),
JOB_REQUEST_SERVER_IN_MAINTENANCE(206),
JOB_REQUEST_SERVER_OVERLOADED(207),
JOB_VALIDATION_ERROR_MISSING_PARAMETER(300), JOB_VALIDATION_ERROR_BROKEN_MACHINE(301), // in GPU the generated frame is black JOB_VALIDATION_ERROR_MISSING_PARAMETER(300),
JOB_VALIDATION_ERROR_FRAME_IS_NOT_IMAGE(302), JOB_VALIDATION_ERROR_UPLOAD_FAILED(303), JOB_VALIDATION_ERROR_SESSION_DISABLED( JOB_VALIDATION_ERROR_BROKEN_MACHINE(301), // in GPU the generated frame is black
304), // missing heartbeat or broken machine JOB_VALIDATION_ERROR_FRAME_IS_NOT_IMAGE(302),
JOB_VALIDATION_ERROR_UPLOAD_FAILED(303),
JOB_VALIDATION_ERROR_SESSION_DISABLED(304), // missing heartbeat or broken machine
JOB_VALIDATION_IMAGE_TOO_LARGE(306), JOB_VALIDATION_IMAGE_TOO_LARGE(306),
JOB_VALIDATION_ERROR_IMAGE_WRONG_DIMENSION(308),
KEEPMEALIVE_STOP_RENDERING(400), KEEPMEALIVE_STOP_RENDERING(400),