open-source/qinglong
1
0
Fork 0
mirror of https://github.com/whyour/qinglong.git synced 2025-07-07 03:46:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

增加资源占用提示

Browse Source
This commit is contained in:
whyour 2022-09-29 00:43:07 +08:00
parent 5530ce76e3
commit c6624e9001
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
shell/task.sh
View File

@ -119,24 +119,25 @@ handle_log_path() {
}
check_server() {
cpu_idle=$(top -b -n 1 | grep Cpu | awk '{print $8}' | cut -f 1 -d "%")
eval echo -e "当前CPU占用 $cpu_use " $cmd
cpu_use=$(top -b -n 1 | grep Cpu | awk '{print $8}' | cut -f 1 -d "%")
mem_free=$(free -m | grep "Mem" | awk '{print $3}')
mem_total=$(free -m | grep "Mem" | awk '{print $2}')
mem_use=$(printf "%d%%" $((mem_free * 100 / mem_total)) | cut -f 1 -d "%")
disk_use=$(df -P | grep /dev | grep -v -E '(tmp|boot|shm)' | awk '{print $5}' | cut -f 1 -d "%")
eval echo "当前CPU占用 $cpu_use% 内存占用 $mem_use% 磁盘占用 $disk_use% \\\n" $cmd
if [[ $cpu_use -gt $cpu_warn ]]; then
notify_api "CPU异常警告" "当前CPU占用 $cpu_use%"
exit 1
fi
mem_free=$(free -m | grep "Mem" | awk '{print $3}')
mem_total=$(free -m | grep "Mem" | awk '{print $2}')
mem_use=$(printf "%d%%" $((mem_free * 100 / mem_total)) | cut -f 1 -d "%")
eval echo -e "内存剩余 $mem_use% " $cmd
if [[ $mem_free -lt $mem_warn ]]; then
notify_api "内存异常警告" "当前内存占用 $mem_use%"
exit 1
fi
disk_use=$(df -P | grep /dev | grep -v -E '(tmp|boot|shm)' | awk '{print $5}' | cut -f 1 -d "%")
eval echo -e "磁盘占用 $disk_use% \\\n" $cmd
if [[ $disk_use -gt $disk_warn ]]; then
notify_api "磁盘异常警告" "当前磁盘占用 $disk_use%"
exit 1

6
src/pages/setting/checkUpdate.tsx
View File

@ -102,6 +102,7 @@ const CheckUpdate = ({ socketMessage }: any) => {
};
const showUpdatingModal = () => {
setValue('');
modalRef.current = Modal.info({
width: 600,
maskClosable: false,
@ -159,12 +160,13 @@ const CheckUpdate = ({ socketMessage }: any) => {
</div>
),
});
setValue(newMessage);
if (updateFailed) {
if (updateFailed && !value.includes('失败，请检查')) {
message.error('更新失败，请检查网络及日志或稍后再试');
}
setValue(newMessage);
document.getElementById('log-identifier') &&
document
.getElementById('log-identifier')!