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

When an error is sent, also send its type

Browse Source
This commit is contained in:
Laurent Clouet
2015-03-11 17:55:44 +00:00
parent 5661dd309c
commit 11b5f55375
2 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -400,9 +400,9 @@ public class Client {
} }
writer.close(); writer.close();
String args = ""; String args = "?type=" + (error == null ? "" : error.getValue());
if (job_to_reset_ != null) { if (job_to_reset_ != null) {
args = "?frame=" + job_to_reset_.getFrameNumber() + "&job=" + job_to_reset_.getId() + "&render_time=" + job_to_reset_.getRenderDuration(); args += "&frame=" + job_to_reset_.getFrameNumber() + "&job=" + job_to_reset_.getId() + "&render_time=" + job_to_reset_.getRenderDuration();
if (job_to_reset_.getExtras() != null && job_to_reset_.getExtras().isEmpty() == false) { if (job_to_reset_.getExtras() != null && job_to_reset_.getExtras().isEmpty() == false) {
args += "&extras=" + job_to_reset_.getExtras(); args += "&extras=" + job_to_reset_.getExtras();
} }

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

@@ -21,27 +21,38 @@ package com.sheepit.client;
public class Error { public class Error {
public enum Type { public enum Type {
OK, // id have to be kept synchronised with the server side.
WRONG_CONFIGURATION, OK(0),
AUTHENTICATION_FAILED, UNKNOWN(99),
TOO_OLD_CLIENT, WRONG_CONFIGURATION(1),
SESSION_DISABLED, AUTHENTICATION_FAILED(2),
RENDERER_NOT_AVAILABLE, TOO_OLD_CLIENT(3),
MISSING_RENDER, SESSION_DISABLED(4),
MISSING_SCENE, RENDERER_NOT_AVAILABLE(5),
NOOUTPUTFILE, MISSING_RENDER(6),
DOWNLOAD_FILE, MISSING_SCENE(7),
CAN_NOT_CREATE_DIRECTORY, NOOUTPUTFILE(8),
NETWORK_ISSUE, DOWNLOAD_FILE(9),
RENDERER_CRASHED, CAN_NOT_CREATE_DIRECTORY(10),
RENDERER_OUT_OF_VIDEO_MEMORY, NETWORK_ISSUE(11),
RENDERER_KILLED, RENDERER_CRASHED(12),
RENDERER_MISSING_LIBRARIES, RENDERER_OUT_OF_VIDEO_MEMORY(13),
FAILED_TO_EXECUTE, RENDERER_KILLED(14),
OS_NOT_SUPPORTED, RENDERER_MISSING_LIBRARIES(15),
CPU_NOT_SUPPORTED, FAILED_TO_EXECUTE(16),
GPU_NOT_SUPPORTED, OS_NOT_SUPPORTED(17),
UNKNOWN CPU_NOT_SUPPORTED(18),
GPU_NOT_SUPPORTED(19);
private final int id;
private Type(int id) {
this.id = id;
}
public int getValue() {
return id;
}
} }
public enum ServerCode { public enum ServerCode {