fix(ci): use killall -9 with fuser fallback for reliable process kill
Some checks failed
BotServer CI/CD / build (push) Has been cancelled
Some checks failed
BotServer CI/CD / build (push) Has been cancelled
This commit is contained in:
parent
bf140a870e
commit
452e674e09
1 changed files with 6 additions and 7 deletions
|
|
@ -80,13 +80,12 @@ jobs:
|
||||||
- name: Deploy via ssh tar gzip
|
- name: Deploy via ssh tar gzip
|
||||||
run: |
|
run: |
|
||||||
set -e
|
set -e
|
||||||
SSH_ARGS="-i /home/gbuser/.ssh/id_ed25519 -o StrictHostKeyChecking=no -o ConnectTimeout=10 -o ServerAliveInterval=10 -o ServerAliveCountMax=3"
|
SSH_ARGS="-i /home/gbuser/.ssh/id_ed25519 -o StrictHostKeyChecking=no -o ConnectTimeout=10 -o ServerAliveInterval=5 -o ServerAliveCountMax=2"
|
||||||
echo "=== Deploy started ==="
|
echo "=== Deploy started ==="
|
||||||
echo "Step 1: Checking binary..."
|
echo "Step 1: Checking binary..."
|
||||||
ls -lh /opt/gbo/data/botserver/target/debug/botserver
|
ls -lh /opt/gbo/data/botserver/target/debug/botserver
|
||||||
echo "Step 2: Killing old botserver..."
|
echo "Step 2: Killing old botserver..."
|
||||||
ssh $SSH_ARGS system "pkill -f '/opt/gbo/bin/botserver' || true"
|
ssh $SSH_ARGS system "fuser -k -9 /opt/gbo/bin/botserver 2>/dev/null || killall -9 botserver 2>/dev/null || true"
|
||||||
sleep 2
|
|
||||||
echo "Step 3: Removing old binary..."
|
echo "Step 3: Removing old binary..."
|
||||||
ssh $SSH_ARGS system "rm -f /opt/gbo/bin/botserver && echo 'Old binary removed'"
|
ssh $SSH_ARGS system "rm -f /opt/gbo/bin/botserver && echo 'Old binary removed'"
|
||||||
echo "Step 4: Starting tar+gzip transfer..."
|
echo "Step 4: Starting tar+gzip transfer..."
|
||||||
|
|
@ -96,13 +95,13 @@ jobs:
|
||||||
echo "Step 6: Setting permissions..."
|
echo "Step 6: Setting permissions..."
|
||||||
ssh $SSH_ARGS system "chmod +x /opt/gbo/bin/botserver && chown gbuser:gbuser /opt/gbo/bin/botserver"
|
ssh $SSH_ARGS system "chmod +x /opt/gbo/bin/botserver && chown gbuser:gbuser /opt/gbo/bin/botserver"
|
||||||
echo "Step 7: Starting botserver..."
|
echo "Step 7: Starting botserver..."
|
||||||
ssh $SSH_ARGS system "cd /opt/gbo/bin && RUST_LOG=info nohup ./botserver --noconsole > /opt/gbo/logs/stdout.log 2>&1 & echo 'Botserver started'"
|
ssh $SSH_ARGS system "cd /opt/gbo/bin && nohup ./botserver --noconsole > /opt/gbo/logs/stdout.log 2>&1 & disown; echo 'Botserver started'"
|
||||||
|
|
||||||
- name: Verify botserver started
|
- name: Verify botserver started
|
||||||
run: |
|
run: |
|
||||||
sleep 15
|
sleep 20
|
||||||
SSH_ARGS="-i /home/gbuser/.ssh/id_ed25519 -o StrictHostKeyChecking=no -o ConnectTimeout=10 -o ServerAliveInterval=10 -o ServerAliveCountMax=3"
|
SSH_ARGS="-i /home/gbuser/.ssh/id_ed25519 -o StrictHostKeyChecking=no -o ConnectTimeout=10 -o ServerAliveInterval=5 -o ServerAliveCountMax=2"
|
||||||
ssh $SSH_ARGS system "pgrep -f '/opt/gbo/bin/botserver' && echo 'OK: botserver is running' || (echo 'ERROR: botserver not running' && ssh $SSH_ARGS system 'tail -20 /opt/gbo/logs/stdout.log' && exit 1)"
|
ssh $SSH_ARGS system "pgrep -f botserver >/dev/null && echo 'OK: botserver is running' || (echo 'ERROR: botserver not running' && ssh $SSH_ARGS system 'tail -30 /opt/gbo/logs/stdout.log' && exit 1)"
|
||||||
|
|
||||||
- name: Save deploy log
|
- name: Save deploy log
|
||||||
if: always()
|
if: always()
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue