li_chx
/
MAAsConfig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[feature] 更新log相关

This commit is contained in:
lichx 2025-01-22 21:25:04 +08:00
parent fc676746cf
commit 069d5119c3
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ArknightsMaaConfig/maa.py
View File

@ -52,7 +52,7 @@ class CommandProcessor:
# cp.Command("command") # cp.Command("command")
# cp.RetryCommand("command",retry_time:int) # cp.RetryCommand("command",retry_time:int)
# asyncio.run(cp.AsyncCommand("command","stop track regex")) # asyncio.run(cp.AsyncCommand("command","stop track regex"))
script_dir = os.path.dirname((os.path.abspath(__file__))) # script_dir = os.path.dirname((os.path.abspath(__file__)))
cp = CommandProcessor() cp = CommandProcessor()
haveError = False haveError = False
def TaskFailRetry(command:str)->int: def TaskFailRetry(command:str)->int:
@ -75,6 +75,7 @@ cp.Command("maa self update")
cp.Command("docker stop redroid") cp.Command("docker stop redroid")
redroid_path = os.getenv('redroid_path', "/home/lichx/.config/redroid-rk3588/") redroid_path = os.getenv('redroid_path', "/home/lichx/.config/redroid-rk3588/")
adb_address = os.getenv('adb_address', "localhost:5555") adb_address = os.getenv('adb_address', "localhost:5555")
log_dir = os.getenv('MAA_LOG', "/home/lichx/.config/redroid-rk3588/log/")
os.chdir(redroid_path) os.chdir(redroid_path)
cp.Command("docker compose up -d") cp.Command("docker compose up -d")
time.sleep(15) time.sleep(15)
@ -89,7 +90,7 @@ haveError |= TaskFailRetry("maa run mall") != 0
haveError |= TaskFailRetry("maa run award") != 0 haveError |= TaskFailRetry("maa run award") != 0
# storage error log # storage error log
if haveError: if haveError:
cp.Command(f"cp {script_dir}/pyshell.log {script_dir}/pyshell.{datetime.now().strftime('%Y-%m-%d-%H-%M-%S')}.log") cp.Command(f"cp {log_dir}/pyshell.log {log_dir}/pyshell.{datetime.now().strftime('%Y-%m-%d-%H-%M-%S')}.log")
# shutdown # shutdown
cp.RetryCommand("maa closedown") cp.RetryCommand("maa closedown")
cp.Command("docker stop redroid") cp.Command("docker stop redroid")

6
run_all.sh
View File

@ -1,9 +1,11 @@
#!/usr/bin/env bash #!/usr/bin/env bash
SCRIPT_DIR=$(dirname $(readlink -f "$0")) SCRIPT_DIR=$(dirname $(readlink -f "$0"))
MAA_PY="$SCRIPT_DIR/ArknightsMaaConfig/maa.py" MAA_PY="$SCRIPT_DIR/ArknightsMaaConfig/maa.py"
MAA_LOG_DIR="${MAA_LOG:-/var/log/maa.log}"
if [ -x "$MAA_PY" ]; then if [ -x "$MAA_PY" ]; then
"$MAA_PY" "$MAA_PY" > "$MAA_LOG_DIR" 2>&1
else else
python3 "$MAA_PY" python3 "$MAA_PY" > "$MAA_LOG_DIR" 2>&1
fi fi