external/fastocloud_admin
1
0
Fork 0
mirror of https://github.com/fastogt/fastocloud_admin.git synced 2025-03-09 23:38:52 +00:00
Code Issues Releases Wiki Activity

Review

Browse source
This commit is contained in:
topilski 2019-06-06 02:22:57 -04:00
parent 0d35c65ea5
commit db07223219
2 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/service/service.py
View file

@ -299,8 +299,8 @@ class Service(IStreamHandler):
self._memory_total = stats[ServiceFields.MEMORY_TOTAL]
self._memory_free = stats[ServiceFields.MEMORY_FREE]
self._memory_available = stats[ServiceFields.MEMORY_AVAILABLE]
self._hdd_total = stats[ServiceFields.MEMORY_TOTAL]
self._hdd_free = stats[ServiceFields.MEMORY_FREE]
self._hdd_total = stats[ServiceFields.HDD_TOTAL]
self._hdd_free = stats[ServiceFields.HDD_FREE]
self._bandwidth_in = stats[ServiceFields.BANDWIDTH_IN]
self._bandwidth_out = stats[ServiceFields.BANDWIDTH_OUT]
self._uptime = stats[ServiceFields.UPTIME]

14
app/templates/user/dashboard.html
View file

@ -229,11 +229,11 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }}
</div>
<div class="col-md-2">
<b>{% trans %}Memory free:{% endtrans %}</b>
<p id='service_free'>{{ service.memory_free }}</p>
<p id='service_memory_free'>{{ service.memory_free }}</p>
</div>
<div class="col-md-2">
<b>{% trans %}Memory available:{% endtrans %}</b>
<p id='service_available'>{{ service.memory_available }}</p>
<p id='service_memory_available'>{{ service.memory_available }}</p>
</div>
<div class="col-md-2">
<b>{% trans %}HDD total:{% endtrans %}</b>
@ -551,15 +551,15 @@ Dashboard | {{ config['PUBLIC_CONFIG'].site.title }}
const kStatuses = ['INIT', 'CONNECTED', 'ACTIVE'];
service_status.text(kStatuses[service.status]);
var service_memory_total = $('#service_memory_total');
service_memory_total.text(service.memory_total + ' MB');
service_memory_total.text(service.memory_total / (1024 * 1024).toFixed(4) + ' MB');
var service_memory_free = $('#service_memory_free');
service_memory_free.text(service.memory_free + ' MB');
service_memory_free.text(service.memory_free / (1024 * 1024).toFixed(4) + ' MB');
var service_memory_available = $('#service_memory_available');
service_memory_available.text(service.memory_available + ' MB');
service_memory_available.text(service.memory_available / (1024 * 1024).toFixed(4) + ' MB');
var service_hdd_total = $('#service_hdd_total');
service_hdd_total.text(service.hdd_total + ' MB');
service_hdd_total.text(service.hdd_total / (1024 * 1024).toFixed(4) + ' MB');
var service_hdd_free = $('#service_hdd_free');
service_hdd_free.text(service.hdd_free + ' MB');
service_hdd_free.text(service.hdd_free / (1024 * 1024).toFixed(4) + ' MB');
var service_timestamp = $('#service_timestamp');
var current_datetime = new Date(service.timestamp);
service_timestamp.text(current_datetime);