codfrm/MoviePilot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #440 from amtoaer/memory_percent

Browse Source
This commit is contained in:
jxxghp 2023-09-04 23:18:46 +08:00 committed by GitHub
commit bedc885232
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/api/endpoints/dashboard.py
View File

@ -134,7 +134,7 @@ def cpu(_: schemas.TokenPayload = Depends(verify_token)) -> Any:
return SystemUtils.cpu_usage() return SystemUtils.cpu_usage()
@router.get("/memory", summary="获取当前内存使用率", response_model=int) @router.get("/memory", summary="获取当前内存使用量和使用率", response_model=List[int])
def memory(_: schemas.TokenPayload = Depends(verify_token)) -> Any: def memory(_: schemas.TokenPayload = Depends(verify_token)) -> Any:
""" """
获取当前内存使用率 获取当前内存使用率

6
app/utils/system.py
View File

@ -287,8 +287,8 @@ class SystemUtils:
return psutil.cpu_percent() return psutil.cpu_percent()
@staticmethod @staticmethod
def memory_usage(): def memory_usage() -> List[int]:
""" """
获取内存使用大小 获取内存使用量和使用率
""" """
return psutil.virtual_memory().used return [psutil.virtual_memory().used, int(psutil.virtual_memory().percent)]