Skip to content

Commit a8a08df

Browse files
committed
fix: handle None for used_swap in memory checks
Updated memory and swap usage functions to correctly handle None values for `used_swap`. Adjusted type hints for better clarity and ensured that the code accounts for potential None values while monitoring memory usage.
1 parent 3d99d3d commit a8a08df

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

main.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,18 @@ def main():
2222
print(" - OOM kill events")
2323

2424
high_memory_start_time = None
25-
used_swap = 0
25+
used_swap = None
2626

2727
while True:
2828
try:
29-
check_memory_usage(
29+
high_memory_start_time = check_memory_usage(
3030
high_memory_start_time,
3131
duration=high_memory_min_duration,
3232
threshold=high_memory_threshold,
3333
)
34-
check_swap_usage(used_swap)
34+
used_swap = check_swap_usage(used_swap)
3535
check_oom_kills()
36-
time.sleep(10) # Check every 10 seconds
36+
time.sleep(10)
3737
except KeyboardInterrupt:
3838
print("Memory monitoring stopped.")
3939
break
@@ -49,12 +49,11 @@ def setup_logging():
4949
)
5050

5151

52-
def check_memory_usage(high_memory_start_time, **kwargs):
52+
def check_memory_usage(high_memory_start_time: float | None, **kwargs) -> float | None:
5353
mem = psutil.virtual_memory()
5454
mem_percent = mem.percent
5555
duration = kwargs.get("duration", 120)
5656
threshold = kwargs.get("threshold", 80)
57-
print(f"Memory usage: {mem_percent:.1f}%")
5857

5958
if mem_percent > threshold:
6059
if high_memory_start_time is None:
@@ -74,14 +73,15 @@ def check_memory_usage(high_memory_start_time, **kwargs):
7473
return high_memory_start_time
7574

7675

77-
def check_swap_usage(used_swap):
76+
def check_swap_usage(used_swap: float | None) -> float | None:
7877
swap = psutil.swap_memory()
7978
if swap.used > 0 and used_swap != swap.used:
8079
swap_percent = swap.percent
8180
used_swap = swap.used
8281
logging.warning(
8382
f"Swap memory in use: {swap.used / (1024**2):.2f} MB ({swap_percent:.1f}%)"
8483
)
84+
return used_swap
8585

8686

8787
def check_oom_kills():

0 commit comments

Comments
 (0)