From 42e952bddfb34aeeb7e2ba3abd0101402011b281 Mon Sep 17 00:00:00 2001 From: Laurent Clouet Date: Wed, 29 Mar 2017 21:46:10 +0200 Subject: [PATCH] Send memory used when reporting an error --- protocol.txt | 2 +- src/com/sheepit/client/Client.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/protocol.txt b/protocol.txt index 60791ac..c3a3712 100644 --- a/protocol.txt +++ b/protocol.txt @@ -168,7 +168,7 @@ Parameter as GET or POST: * frame: job's frame number * extras: job's extra data * 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: * file: the error log to send diff --git a/src/com/sheepit/client/Client.java b/src/com/sheepit/client/Client.java index eb27bf9..531b909 100644 --- a/src/com/sheepit/client/Client.java +++ b/src/com/sheepit/client/Client.java @@ -484,7 +484,7 @@ public class Client { writer.close(); String args = "?type=" + (error == null ? "" : error.getValue()); 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) { args += "&extras=" + job_to_reset_.getExtras(); }