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

Merge branch 'master' into 3.0

Browse Source 
# Conflicts:
#	.github/workflows/testing.yml
#	Dockerfile
#	gns3server/version.py
This commit is contained in:
grossmj
2021-10-09 12:16:50 +10:30
parent d485a857a2 6cb8b9a75e
commit 0b200def88
17 changed files with 60 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
gns3server/compute/base_node.py
View File

@ -974,7 +974,7 @@ class BaseNode:
"""
available_ram = int(psutil.virtual_memory().available / (1024 * 1024))
percentage_left = psutil.virtual_memory().percent
percentage_left = 100 - psutil.virtual_memory().percent
if requested_ram > available_ram:
message = '"{}" requires {}MB of RAM to run but there is only {}MB - {}% of RAM left on "{}"'.format(
self.name, requested_ram, available_ram, percentage_left, platform.node()