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

Send memory used when reporting an error

Browse Source
This commit is contained in:
Laurent Clouet
2017-03-29 21:46:10 +02:00
parent 29a47f107e
commit 42e952bddf
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
protocol.txt
View File

@@ -168,7 +168,7 @@ Parameter as GET or POST:
* frame: job's frame number * frame: job's frame number
* extras: job's extra data * extras: job's extra data
* rendertime (optional): job's frame number * rendertime (optional): job's frame number
* memoryused (optional): max memory used for the render * memoryused (optional): max memory used for the render (in kilo bytes)
Parameter as form-urlencoded: Parameter as form-urlencoded:
* file: the error log to send * file: the error log to send

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

@@ -484,7 +484,7 @@ public class Client {
writer.close(); writer.close();
String args = "?type=" + (error == null ? "" : error.getValue()); 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_.getProcessRender().getDuration(); args += "&frame=" + job_to_reset_.getFrameNumber() + "&job=" + job_to_reset_.getId() + "&render_time=" + job_to_reset_.getProcessRender().getDuration() + "&memoryused=" + job_to_reset_.getProcessRender().getMemoryUsed();
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();
} }