ExternalVendorCode/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server.git synced 2025-06-17 23:08:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Return disk usage for partition that contains the default project directory. Fixes #1947

Browse Source
This commit is contained in:
grossmj
2021-09-03 12:04:10 +09:30
parent 041d2bd2d6
commit a55c9a5c6a
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gns3server/handlers/api/compute/server_handler.py
View File

@ -24,6 +24,7 @@ from gns3server.schemas.version import VERSION_SCHEMA
from gns3server.schemas.server_statistics import SERVER_STATISTICS_SCHEMA
from gns3server.compute.port_manager import PortManager
from gns3server.utils.cpu_percent import CpuPercent
from gns3server.utils.path import get_default_project_directory, get_mountpoint
from gns3server.version import __version__
from aiohttp.web import HTTPConflict
@ -61,7 +62,8 @@ class ServerHandler:
load_average_percent = [int(x / psutil.cpu_count() * 100) for x in psutil.getloadavg()]
memory_percent = int(psutil.virtual_memory().percent)
swap_percent = int(psutil.swap_memory().percent)
disk_usage_percent = int(psutil.disk_usage('/').percent)
project_dir_mountpoint = get_mountpoint(get_default_project_directory())
disk_usage_percent = int(psutil.disk_usage(project_dir_mountpoint).percent)
except psutil.Error as e:
raise HTTPConflict(text="Psutil error detected: {}".format(e))
response.json({"memory_total": memory_total,