v1.1.0 deploy

This commit is contained in:
Carlos
2019-08-13 20:52:28 +02:00
parent 7f170f15b6
commit 5dfd026ca8
10 changed files with 234 additions and 94 deletions

View File

@ -15,7 +15,7 @@ public class RamUsageCommand implements WSCommand {
int max = (int) r.maxMemory()/1024/1024;
int used = max - free;
wsServer.sendToClient(conn, new RamUsage(free + "free, " + used + " used," + max + " maximum memmory", free, used, max));
wsServer.sendToClient(conn, new RamUsage(free + " free, " + used + " used, " + max + " maximum memmory", free, used, max));
}
}

View File

@ -33,7 +33,7 @@ public class CpuUsage implements JSONOutput{
public String toJSON() {
JsonObject object = new JsonObject();
object.addProperty("status", getStatusCode());
object.addProperty("statusDescription", "Cpu Usage");
object.addProperty("statusDescription", "CPU Usage");
object.addProperty("usage", getUsage());
object.addProperty("message", getMessage());
return object.toString();

View File

@ -55,7 +55,7 @@ public class RamUsage implements JSONOutput {
object.addProperty("status", getStatusCode());
object.addProperty("statusDescription", "RAM Usage");
object.addProperty("free", getFree());
object.addProperty("total", getUsed());
object.addProperty("used", getUsed());
object.addProperty("max", getMax());
object.addProperty("message", getMessage());
return object.toString();