refactor(build): simplify retry logic for file uploads in build workflow

Author: 0xJacky

.github/workflows/build.yml

@@ -293,34 +293,17 @@ jobs:
           apiToken: ${{ secrets.CF_R2_API_TOKEN }}
           wranglerVersion: "4.21.1"
           command: |
-            retry_upload() {
-              local file_path="$1"
-              local remote_path="$2"
-              local max_attempts=3
-              local attempt=1
-              
-              while [ $attempt -le $max_attempts ]; do
-                echo "Attempt $attempt of $max_attempts: Uploading $file_path to $remote_path"
-                if r2 object put "$remote_path" --file "$file_path" --remote; then
-                  echo "Successfully uploaded $file_path on attempt $attempt"
-                  return 0
-                else
-                  echo "Failed to upload $file_path on attempt $attempt"
-                  if [ $attempt -lt $max_attempts ]; then
-                    echo "Waiting 5 seconds before retry..."
-                    sleep 5
-                  fi
-                  attempt=$((attempt + 1))
-                fi
-              done
-              
-              echo "Failed to upload $file_path after $max_attempts attempts"
-              return 1
-            }
-            
-            # Upload files with retry
-            retry_upload ./${{ env.DIST }}.tar.gz nginx-ui-dev-build/${{ env.DIST }}.tar.gz
-            retry_upload ./${{ env.DIST }}.tar.gz.digest nginx-ui-dev-build/${{ env.DIST }}.tar.gz.digest
+            for i in 1 2 3; do
+              echo "Attempt $i: Uploading ${{ env.DIST }}.tar.gz"
+              wrangler r2 object put nginx-ui-dev-build/${{ env.DIST }}.tar.gz --file ./${{ env.DIST }}.tar.gz --remote && break
+              [ $i -lt 3 ] && sleep 5
+            done
+          
+            for i in 1 2 3; do
+              echo "Attempt $i: Uploading ${{ env.DIST }}.tar.gz.digest"
+              wrangler r2 object put nginx-ui-dev-build/${{ env.DIST }}.tar.gz.digest --file ./${{ env.DIST }}.tar.gz.digest --remote && break
+              [ $i -lt 3 ] && sleep 5
+            done
 
   docker-build:
     if: github.event_name != 'pull_request'

internal/nginx/resolve_path.go

@@ -11,6 +11,10 @@ import (
 	"github.com/uozi-tech/cosy/logger"
 )
 
+var (
+	nginxPrefix string
+)
+
 // Returns the directory containing the nginx executable
 func GetNginxExeDir() string {
 	return filepath.Dir(getNginxSbinPath())
@@ -32,14 +36,21 @@ func resolvePath(path string) string {
 
 // GetPrefix returns the prefix of the nginx executable
 func GetPrefix() string {
+	if nginxPrefix != "" {
+		return nginxPrefix
+	}
+
 	out := getNginxV()
 	r, _ := regexp.Compile(`--prefix=(\S+)`)
 	match := r.FindStringSubmatch(out)
 	if len(match) < 1 {
 		logger.Error("nginx.GetPrefix len(match) < 1")
-		return "/usr/local/nginx"
+		nginxPrefix = "/usr/local/nginx"
+		return nginxPrefix
 	}
-	return resolvePath(match[1])
+
+	nginxPrefix = resolvePath(match[1])
+	return nginxPrefix
 }
 
 // GetConfPath returns the path of the nginx configuration file

internal/nginx_log/nginx_log.go

@@ -17,18 +17,17 @@ import (
 // Regular expression for log directives - matches access_log or error_log
 var (
 	logDirectiveRegex = regexp.MustCompile(`(?m)(access_log|error_log)\s+([^\s;]+)(?:\s+[^;]+)?;`)
-	prefix            = ""
 )
 
 // Use init function to automatically register callback
 func init() {
-	prefix = nginx.GetPrefix()
 	// Register the callback directly with the global registry
 	cache.RegisterCallback(scanForLogDirectives)
 }
 
 // scanForLogDirectives scans and parses configuration files for log directives
 func scanForLogDirectives(configPath string, content []byte) error {
+	prefix := nginx.GetPrefix()
 	// First, remove all log paths that came from this config file
 	// This ensures that removed log directives are properly cleaned up
 	RemoveLogPathsFromConfig(configPath)
@@ -147,6 +146,7 @@ func isValidLogPath(logPath string) bool {
 
 // IsLogPathUnderWhiteList checks if a log path is under one of the paths in LogDirWhiteList
 func IsLogPathUnderWhiteList(path string) bool {
+	prefix := nginx.GetPrefix()
 	cacheKey := fmt.Sprintf("isLogPathUnderWhiteList:%s", path)
 	res, ok := cache.Get(cacheKey)