modify scripts
This commit is contained in:
oscarz
@ -1,13 +0,0 @@
|
||||
import json
|
||||
import time
|
||||
import src.db_utils.sqlite_db as sqlite_db
|
||||
import src.utils.utils as utils
|
||||
|
||||
db_tools = sqlite_db.JavbusDBHandler()
|
||||
|
||||
if __name__ == "__main__":
|
||||
# 命令行参数处理
|
||||
result = db_tools.get_statics()
|
||||
utils.pretty_print_json(result)
|
||||
|
||||
|
||||
137
src/monitor/run.sh
Executable file
137
src/monitor/run.sh
Executable file
@ -0,0 +1,137 @@
|
||||
#!/bin/bash
|
||||
|
||||
: << 'EOF'
|
||||
执行本地脚本，以实现任务的状态监控。
|
||||
远程机上部署发送通知（企微）的脚本，把结果发送出来。
|
||||
EOF
|
||||
|
||||
# 颜色定义
|
||||
RED='\033[0;31m'
|
||||
GREEN='\033[0;32m'
|
||||
YELLOW='\033[0;33m'
|
||||
NC='\033[0m' # 无颜色
|
||||
|
||||
# 定义命令映射和函数
|
||||
declare -A COMMAND_MAP
|
||||
declare -a COMMAND_ORDER # 记录命令注册顺序，用于帮助信息
|
||||
|
||||
REMOTE_SERVER="101.33.230.186"
|
||||
REMOTR_USER="root"
|
||||
SSH_OTRS="-o StrictHostKeyChecking=no -o ConnectTimeout=10"
|
||||
|
||||
# 注册命令函数并添加到映射
|
||||
register_command() {
|
||||
local cmd_name=$1
|
||||
local cmd_desc=$2
|
||||
COMMAND_MAP[$cmd_name]=$cmd_desc
|
||||
COMMAND_ORDER+=($cmd_name)
|
||||
}
|
||||
|
||||
# 执行本地命令并将结果发送到远程的通用函数
|
||||
execute_local_and_send_remote() {
|
||||
local local_cmd=$1
|
||||
local desc=$2
|
||||
|
||||
echo -e "${YELLOW}执行命令: ${desc}${NC}"
|
||||
echo "----------------------------------------"
|
||||
|
||||
# 执行本地命令
|
||||
RESULT=$(eval $local_cmd)
|
||||
EXIT_CODE=$?
|
||||
|
||||
# 输出结果
|
||||
if [ $EXIT_CODE -eq 0 ]; then
|
||||
echo -e "${GREEN}命令执行成功${NC}"
|
||||
echo "$RESULT"
|
||||
|
||||
# 调用远程脚本并将本地命令结果作为输入
|
||||
ssh $SSH_OTRS $REMOTR_USER@$REMOTE_SERVER "cd /root/projects/devops/tools; python3 ./send_to_wecom.py '$RESULT'"
|
||||
return 0
|
||||
else
|
||||
echo -e "${RED}命令执行失败，退出代码: $EXIT_CODE${NC}"
|
||||
return $EXIT_CODE
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
# 定义具体命令函数
|
||||
cmd_javbus() {
|
||||
execute_local_and_send_remote \
|
||||
"cd /root/projects/resources && python3 -m src.javbus.fetch --cmd=check" \
|
||||
"检查服务状态"
|
||||
}
|
||||
|
||||
# 定义具体命令函数
|
||||
cmd_aabook() {
|
||||
execute_local_and_send_remote \
|
||||
"cd /root/projects/resources/aabook/src/ && python3 ./check_status.py" \
|
||||
"检查服务状态"
|
||||
}
|
||||
|
||||
# 定义具体命令函数
|
||||
cmd_iafd() {
|
||||
execute_local_and_send_remote \
|
||||
"cd /root/projects/resources/iafd/src/ && python3 ./fetch.py --cmd=check" \
|
||||
"检查服务状态"
|
||||
}
|
||||
|
||||
# 注册命令
|
||||
register_command "aabook" "查询 aabook 任务进度"
|
||||
register_command "javbus" "查询 javbus 任务进度"
|
||||
register_command "iafd" "查询 iafd 任务进度"
|
||||
|
||||
# 显示帮助信息
|
||||
show_help() {
|
||||
echo "用法: $0 [命令1] [命令2] [...]"
|
||||
echo "可用命令:"
|
||||
|
||||
for cmd in "${COMMAND_ORDER[@]}"; do
|
||||
printf " %-10s %s\n" "$cmd" "${COMMAND_MAP[$cmd]}"
|
||||
done
|
||||
|
||||
echo
|
||||
echo "示例:"
|
||||
echo " $0 check fetch"
|
||||
echo " $0 backup"
|
||||
}
|
||||
|
||||
# 主函数
|
||||
main() {
|
||||
# 检查是否提供了命令参数
|
||||
if [ $# -eq 0 ]; then
|
||||
show_help
|
||||
exit 1
|
||||
fi
|
||||
|
||||
local success=true
|
||||
|
||||
# 处理每个命令参数
|
||||
for cmd in "$@"; do
|
||||
# 检查命令是否存在
|
||||
if [[ -z "${COMMAND_MAP[$cmd]}" ]]; then
|
||||
echo -e "${RED}错误: 未知命令 '$cmd'${NC}"
|
||||
show_help
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# 执行对应的命令函数
|
||||
cmd_${cmd}
|
||||
if [ $? -ne 0 ]; then
|
||||
success=false
|
||||
fi
|
||||
|
||||
echo
|
||||
done
|
||||
|
||||
# 输出总体执行结果
|
||||
if [ "$success" = true ]; then
|
||||
echo -e "${GREEN}所有命令执行成功${NC}"
|
||||
exit 0
|
||||
else
|
||||
echo -e "${RED}部分命令执行失败${NC}"
|
||||
exit 1
|
||||
fi
|
||||
}
|
||||
|
||||
# 执行主函数
|
||||
main "$@"
|
||||
133
src/monitor/scheduler.py
Normal file
133
src/monitor/scheduler.py
Normal file
@ -0,0 +1,133 @@
|
||||
import subprocess
|
||||
import time
|
||||
import threading
|
||||
import logging
|
||||
from typing import Callable
|
||||
import signal
|
||||
|
||||
# 配置日志
|
||||
logging.basicConfig(
|
||||
level=logging.INFO,
|
||||
format='%(asctime)s - %(levelname)s - %(message)s'
|
||||
)
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
class CommandScheduler:
|
||||
"""命令调度器：立即执行命令并定时重复执行，退出前再执行一次"""
|
||||
|
||||
def __init__(self, command: str, interval: int = 1800, execute_immediately: bool = True):
|
||||
"""
|
||||
初始化命令调度器
|
||||
|
||||
参数:
|
||||
command: 要执行的Shell命令
|
||||
interval: 执行间隔(秒)，默认30分钟
|
||||
execute_immediately: 是否立即执行命令，默认True
|
||||
"""
|
||||
self.command = command
|
||||
self.interval = interval
|
||||
self.execute_immediately = execute_immediately
|
||||
self._stop_event = threading.Event()
|
||||
self._timer_thread = None
|
||||
self._should_execute_on_exit = True # 控制退出前是否执行命令
|
||||
|
||||
def run_periodically(self) -> None:
|
||||
"""启动周期性执行命令"""
|
||||
def _execute_command():
|
||||
# 立即执行命令（如果设置了）
|
||||
if self.execute_immediately:
|
||||
self._run_command()
|
||||
|
||||
# 然后按间隔周期性执行
|
||||
while not self._stop_event.wait(self.interval):
|
||||
self._run_command()
|
||||
|
||||
self._timer_thread = threading.Thread(target=_execute_command, daemon=True)
|
||||
self._timer_thread.start()
|
||||
logger.info(f"定时任务已启动，每 {self.interval} 秒执行一次")
|
||||
|
||||
def _run_command(self) -> None:
|
||||
"""执行命令的辅助方法"""
|
||||
try:
|
||||
logger.info(f"开始执行命令: {self.command}")
|
||||
result = subprocess.run(
|
||||
self.command,
|
||||
shell=True,
|
||||
capture_output=True,
|
||||
text=True
|
||||
)
|
||||
|
||||
if result.returncode == 0:
|
||||
logger.info("命令执行成功")
|
||||
logger.debug(f"标准输出: {result.stdout}")
|
||||
else:
|
||||
logger.error(f"命令执行失败，返回码: {result.returncode}")
|
||||
logger.error(f"错误输出: {result.stderr}")
|
||||
except Exception as e:
|
||||
logger.error(f"执行命令时发生异常: {e}")
|
||||
|
||||
def stop(self, execute_on_exit: bool = True) -> None:
|
||||
"""
|
||||
停止定时任务
|
||||
|
||||
参数:
|
||||
execute_on_exit: 退出前是否执行一次命令，默认True
|
||||
"""
|
||||
self._should_execute_on_exit = execute_on_exit
|
||||
|
||||
# 设置停止事件
|
||||
self._stop_event.set()
|
||||
|
||||
# 等待定时器线程结束
|
||||
if self._timer_thread:
|
||||
self._timer_thread.join(timeout=5)
|
||||
|
||||
# 在退出前执行一次命令
|
||||
if self._should_execute_on_exit:
|
||||
logger.info("执行退出前的最后一次命令...")
|
||||
self._run_command()
|
||||
|
||||
logger.info("定时任务已停止")
|
||||
|
||||
|
||||
def main():
|
||||
# 要执行的Shell命令（示例）
|
||||
shell_command = "cd ~/shell; ./run.sh"
|
||||
|
||||
# 创建命令调度器（30分钟执行一次，立即执行首次）
|
||||
scheduler = CommandScheduler(
|
||||
command=shell_command,
|
||||
interval=1800,
|
||||
execute_immediately=True
|
||||
)
|
||||
|
||||
# 注册信号处理函数
|
||||
def signal_handler(signum, frame):
|
||||
logger.info(f"接收到信号 {signum}，准备退出...")
|
||||
scheduler.stop() # 停止时执行最后一次命令
|
||||
raise SystemExit(0)
|
||||
|
||||
# 捕获常见的终止信号
|
||||
signal.signal(signal.SIGINT, signal_handler) # Ctrl+C
|
||||
signal.signal(signal.SIGTERM, signal_handler) # 普通终止信号
|
||||
|
||||
scheduler.run_periodically()
|
||||
|
||||
try:
|
||||
logger.info("主程序运行中，按Ctrl+C退出...")
|
||||
while True:
|
||||
time.sleep(60) # 主程序保持运行
|
||||
except SystemExit:
|
||||
# 正常退出，已在信号处理函数中完成清理
|
||||
pass
|
||||
except Exception as e:
|
||||
logger.error(f"发生异常: {e}")
|
||||
scheduler.stop(execute_on_exit=False) # 异常时不执行最后一次命令
|
||||
finally:
|
||||
# 确保资源被释放
|
||||
if not scheduler._stop_event.is_set():
|
||||
scheduler.stop(execute_on_exit=False)
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
main()
|
||||
Reference in New Issue
Block a user