From 02bcfea745d48abd12991ba3f6557903a1244f1b Mon Sep 17 00:00:00 2001
From: NanamiAdmin <yzt114@yeah.net>
Date: Sun, 10 May 2026 17:44:25 +0800
Subject: [PATCH] fix(watchdog): improve logging context in keepalive error
 handling

---
 watchdog/keepalive.go | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/watchdog/keepalive.go b/watchdog/keepalive.go
index 7782893..6a50b84 100644
--- a/watchdog/keepalive.go
+++ b/watchdog/keepalive.go
@@ -17,12 +17,13 @@ func StartKeepAlive() error {
 
 		if err := isProcessAlive(); err != nil {
 			global.Is.WatchdogConnected = false
-			postLog.Warning(fmt.Sprintf("[watchdog] keepalive check failed: %v", err))
+			postLog.Warning(fmt.Sprintf("[watchdog.StartKeepAlive] keepalive check failed: %v", err))
 
 			_ = Disconnect()
 
 			var lastErr error
 			for i := 0; i < 5; i++ {
+				KillWatchdogProcess()
 				if err := ensureWatchdogProcess(); err != nil {
 					lastErr = err
 					time.Sleep(500 * time.Millisecond)
@@ -31,7 +32,7 @@ func StartKeepAlive() error {
 
 				if err = Init(); err == nil && Connect() {
 					global.Is.WatchdogConnected = true
-					postLog.Info("[watchdog] successfully reconnected to watchdog")
+					postLog.Info("[watchdog.StartKeepAlive] successfully reconnected to watchdog")
 					lastErr = nil
 					break
 				}
@@ -41,7 +42,7 @@ func StartKeepAlive() error {
 			}
 
 			if lastErr != nil {
-				postLog.Error(fmt.Sprintf("[watchdog] failed to recover watchdog connection: %v", lastErr))
+				postLog.Error(fmt.Sprintf("[watchdog.StartKeepAlive] failed to recover watchdog connection: %v", lastErr))
 				return fmt.Errorf("watchdog recovery failed after 5 attempts: %w", lastErr)
 			}
 		}