From 6700c818cb32d4ae0e9bb3224241ae7cd707cc5f Mon Sep 17 00:00:00 2001 From: apexliu Date: Sat, 4 Mar 2017 04:40:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Windows=E5=B9=B3=E5=8F=B0?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=A3=81=E7=9B=98=E7=A9=BA=E9=97=B4=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E5=8F=AF=E8=83=BD=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../teleport/app/eom_app/controller/record.py | 23 +++++++++++-------- server/www/teleport/static/js/ui/log.js | 7 +++--- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/server/www/teleport/app/eom_app/controller/record.py b/server/www/teleport/app/eom_app/controller/record.py index f7f7fe0..5062533 100644 --- a/server/www/teleport/app/eom_app/controller/record.py +++ b/server/www/teleport/app/eom_app/controller/record.py @@ -17,27 +17,32 @@ def get_free_space_mb(folder): """ Return folder/drive free space (in bytes) """ if platform.system() == 'Windows': - free_bytes = ctypes.c_ulonglong(0) - total_bytes = ctypes.c_ulonglong(0) - ctypes.windll.kernel32.GetDiskFreeSpaceExW(None, None, ctypes.pointer(total_bytes), ctypes.pointer(free_bytes)) - return total_bytes.value / 1024 / 1024 / 1024, free_bytes.value / 1024 / 1024 / 1024 + _free_bytes = ctypes.c_ulonglong(0) + _total_bytes = ctypes.c_ulonglong(0) + ctypes.windll.kernel32.GetDiskFreeSpaceExW(folder, None, ctypes.pointer(_total_bytes), ctypes.pointer(_free_bytes)) + # return _total_bytes.value / 1024 / 1024 / 1024, _free_bytes.value / 1024 / 1024 / 1024 + total_bytes = _total_bytes.value + free_bytes = _free_bytes.value else: st = os.statvfs(folder) - return st.f_blocks * st.f_frsize / 1024 / 1024 / 1024, st.f_bavail * st.f_frsize / 1024 / 1024 / 1024 + # return st.f_blocks * st.f_frsize / 1024 / 1024 / 1024, st.f_bavail * st.f_frsize / 1024 / 1024 / 1024 + total_bytes = st.f_blocks * st.f_frsize + free_bytes = st.f_bavail * st.f_frsize + + return total_bytes, free_bytes class LogHandler(SwxAdminHandler): def get(self): - # user_list = user.get_user_list() total_size, free_size = get_free_space_mb(cfg.data_path) # config_list = host.get_config_list() ts_server = dict() - ts_server['ip'] = cfg.core.rpc.ip #config_list['ts_server_ip'] - ts_server['port'] = cfg.core.rpc.port #cfg.server_port + ts_server['ip'] = cfg.core.rpc.ip # config_list['ts_server_ip'] + ts_server['port'] = cfg.core.rpc.port # cfg.server_port - self.render('log/index.mako', user_list=user_list, total_size=int(total_size), free_size=int(free_size), ts_server=ts_server) + self.render('log/index.mako', user_list=user_list, total_size=total_size, free_size=free_size, ts_server=ts_server) class RecordHandler(SwxAdminHandler): diff --git a/server/www/teleport/static/js/ui/log.js b/server/www/teleport/static/js/ui/log.js index 9e093b2..38c0857 100644 --- a/server/www/teleport/static/js/ui/log.js +++ b/server/www/teleport/static/js/ui/log.js @@ -9,15 +9,14 @@ ywl.on_init = function (cb_stack, cb_args) { // 创建页面控件对象 //=================================== // 表格数据 - //console.log('ywl.page_options.total_size,', ywl.page_options.total_size, ywl.page_options.free_size); var disk_rate = parseInt(ywl.page_options.free_size * 100 / ywl.page_options.total_size); - $('#disk-status').text('日志磁盘大小：' + ywl.page_options.total_size + 'GB，剩余空间：' + ywl.page_options.free_size + 'GB，空闲' + disk_rate + '%'); + $('#disk-status').text('日志磁盘大小：' + size2str(ywl.page_options.total_size, 2) + '，剩余空间：' + size2str(ywl.page_options.free_size, 2) + '，空闲' + disk_rate + '%'); if (disk_rate < 10) { $('#disk-status').removeClass().addClass('badge badge-danger'); - } else if (disk_rate < 50) { + } else if (disk_rate < 30) { $('#disk-status').removeClass().addClass('badge badge-warning'); } else { - $('#disk-status').removeClass().addClass('badge badge-info'); + $('#disk-status').removeClass().addClass('badge badge-ignore'); } var host_table_options = {