diff --git a/Changes.txt b/Changes.txt index efdfbae..25183b6 100644 --- a/Changes.txt +++ b/Changes.txt @@ -1,5 +1,11 @@ changes log ====================================== + +------------------------------ +1.0.0 2023-11-28 + +1.增加资源的阈值判断,如果大于阈值就发邮件 + ------------------------------ 1.0.0 2023-11-22 diff --git a/bin/get_system_info.py b/bin/get_system_info.py index 6873c6a..17a9154 100644 --- a/bin/get_system_info.py +++ b/bin/get_system_info.py @@ -56,7 +56,10 @@ def send_mail(): # 接收者 msg['To'] = Header(receivers[0], 'utf-8') # 主题 - subject = '【长期任务】第{0}周{1}系统运行信息'.format(week, get_IP()) + error_msg = "" + if need_sendmail: + error_msg = "【资源警告】" + subject = '【长期任务】{0}第{1}周{2}系统运行信息'.format(error_msg, week, get_IP()) msg['Subject'] = Header(subject, 'utf-8') # 附件信息 att = MIMEText(open(str(file_week_path), 'rb').read(), 'base64', 'utf-8') @@ -163,11 +166,12 @@ def get_memory_info(): # 检测是否超过阈值 error_msg = "" if memory_percent > config["Memory_MAX"]: - error_msg = "\n\t警告: 内存使用率超过{0},请及时处理!".format(str(config["Memory_MAX"])) + error_msg = "\n\t警告: 内存使用率超过{0},请及时处理!".format( + str(config["Memory_MAX"])) global need_sendmail need_sendmail = True memory_info = ["内存使用:{0:0.2f}G,使用率{1:0.1f}%,剩余内存:{2:0.2f}G {3}".format( - used_memory, memory_percent, free_memory,error_msg), ""] + used_memory, memory_percent, free_memory, error_msg), ""] print(memory_info) # return memory_info save_txt(memory_info)