diff --git a/.github/workflows/release-lite.yml b/.github/workflows/release-lite.yml index d4f9b13b..2b6facfa 100644 --- a/.github/workflows/release-lite.yml +++ b/.github/workflows/release-lite.yml @@ -59,7 +59,7 @@ jobs: - os: ubuntu-24.04-arm goos: linux goarch: arm64 - - os: macos-13 + - os: macos-14 goos: darwin goarch: amd64 - os: macos-14 @@ -143,7 +143,7 @@ jobs: platform: darwin/universal arch_label: macOS_universal artifact_name: desktop-macos-universal - - os: macos-13 + - os: macos-14 platform: darwin/amd64 arch_label: macOS_amd64 artifact_name: desktop-macos-amd64 diff --git a/.gitignore b/.gitignore index c5241632..eafeff8c 100644 --- a/.gitignore +++ b/.gitignore @@ -41,7 +41,7 @@ web/ **/__pycache__ /scripts/scale_dev_jobs.sh -server +/server frontend/.vite frontend/chrome-extension/ WeKnora-Chrome-Extension \ No newline at end of file diff --git a/cmd/server/listen.go b/cmd/server/listen.go new file mode 100644 index 00000000..8df1ddf9 --- /dev/null +++ b/cmd/server/listen.go @@ -0,0 +1,29 @@ +package main + +import ( + "context" + "net" + "time" + + "github.com/Tencent/WeKnora/internal/logger" +) + +func listenWithRetry(addr string, maxRetries int, baseDelay time.Duration) (net.Listener, error) { + var lastErr error + for i := 0; i < maxRetries; i++ { + listener, err := net.Listen("tcp", addr) + if err == nil { + return listener, nil + } + lastErr = err + if i < maxRetries-1 { + delay := baseDelay * time.Duration(1< 3*time.Second { + delay = 3 * time.Second + } + logger.Warnf(context.Background(), "Port %s in use, retrying in %v... (%d/%d)", addr, delay, i+1, maxRetries) + time.Sleep(delay) + } + } + return nil, lastErr +} diff --git a/cmd/server/signals_unix.go b/cmd/server/signals_unix.go new file mode 100644 index 00000000..0b82816f --- /dev/null +++ b/cmd/server/signals_unix.go @@ -0,0 +1,10 @@ +//go:build !windows + +package main + +import ( + "os" + "syscall" +) + +var shutdownSignals = []os.Signal{syscall.SIGINT, syscall.SIGTERM, syscall.SIGHUP} diff --git a/cmd/server/signals_windows.go b/cmd/server/signals_windows.go new file mode 100644 index 00000000..620cae71 --- /dev/null +++ b/cmd/server/signals_windows.go @@ -0,0 +1,10 @@ +//go:build windows + +package main + +import ( + "os" + "syscall" +) + +var shutdownSignals = []os.Signal{syscall.SIGINT, syscall.SIGTERM}