Skip to content

Commit 27f769f

Browse files
committed
Fixed ram usage being incorrect
1 parent 7c4286f commit 27f769f

2 files changed

Lines changed: 10 additions & 13 deletions

File tree

client/index.html

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -153,9 +153,6 @@ <h5 class="modal-title" id="addServerModalLongTitle">Add a new server</h5>
153153
<div class="form-group">
154154
<label for="server-name" class="col-form-label" id="addServerModalSvName">Server name:</label>
155155
<input type="text" class="form-control" id="server-name" required>
156-
<div class="invalid-feedback" id="serverNameInvalidFeedback">
157-
Please provide a valid servername.
158-
</div>
159156
</div>
160157
<div class="form-group">
161158
<label for="server-ip" class="col-form-label" id="addServerModalSvIp">Server IP:</label>
@@ -267,7 +264,7 @@ <h5 class="modal-title" id="settingsModalLongTitle">WebConsole Settings</h5>
267264
<!-- Webpage footer -->
268265
<footer class="footer mt-auto py-3">
269266
<div class="container">
270-
<span class="text-muted">WebConsole v2.0 (rev. 2) - <a href="https://github.com/mesacarlos/WebConsole">GitHub</a></span>
267+
<span class="text-muted">WebConsole v2.0 (rev. 3) - <a href="https://github.com/mesacarlos/WebConsole">GitHub</a></span>
271268
</div>
272269
</footer>
273270

@@ -277,15 +274,15 @@ <h5 class="modal-title" id="settingsModalLongTitle">WebConsole Settings</h5>
277274
<script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
278275

279276
<!-- WebConsole JS Objects -->
280-
<script src="scripts/object/Setting.js?v=2.2"></script>
281-
<script src="scripts/object/WSServer.js?v=2.2"></script>
277+
<script src="scripts/object/Setting.js?v=2.0.3"></script>
278+
<script src="scripts/object/WSServer.js?v=2.0.3"></script>
282279

283280
<!-- WebConsole JS Scripts -->
284-
<script src="scripts/WebConsoleLanguage.js?v=2.2"></script>
285-
<script src="scripts/WebConsoleConnector.js?v=2.2"></script>
286-
<script src="scripts/WebConsoleManager.js?v=2.2"></script>
287-
<script src="scripts/WebConsolePersistenceManager.js?v=2.2"></script>
288-
<script src="scripts/WebConsole.js?v=2.2"></script>
289-
<script src="scripts/WebConsoleJqueryHandler.js?v=2.2"></script>
281+
<script src="scripts/WebConsoleLanguage.js?v=2.0.3"></script>
282+
<script src="scripts/WebConsoleConnector.js?v=2.0.3"></script>
283+
<script src="scripts/WebConsoleManager.js?v=2.0.3"></script>
284+
<script src="scripts/WebConsolePersistenceManager.js?v=2.0.3"></script>
285+
<script src="scripts/WebConsole.js?v=2.0.3"></script>
286+
<script src="scripts/WebConsoleJqueryHandler.js?v=2.0.3"></script>
290287
</body>
291288
</html>

src/es/mesacarlos/webconsole/websocket/command/RamUsageCommand.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public void execute(WSServer wsServer, WebSocket conn, String params) {
1414

1515
long free = r.freeMemory() / 1024 / 1024;
1616
long max = r.maxMemory() / 1024 / 1024;
17-
long used = max - free;
17+
long used = r.totalMemory() / 1024 / 1024 - free;
1818

1919
wsServer.sendToClient(conn,
2020
new RamUsage(

0 commit comments

Comments
 (0)