경로 통일

cmd/user_program_sync/main.go

@@ -4,72 +4,42 @@ import (
 	"context"
 	"log"
 	"os"
-	"os/exec"
-	"path/filepath"
 	"time"
+
+	"geoip-rest/internal/userprogram"
 )
 
-const (
-	defaultUpdateDir = "/app/update_data"
-	defaultLogDir    = "/app/log"
-	defaultSchema    = "public"
-	defaultTimeout   = 15 * time.Minute
-)
+const defaultTimeout = 30 * time.Minute
 
 func main() {
 	logger := log.New(os.Stdout, "[sync] ", log.LstdFlags)
 
+	dbURL := os.Getenv("DATABASE_URL")
+	if dbURL == "" {
+		logger.Fatal("DATABASE_URL is required")
+	}
+
+	mysqlCfg, err := userprogram.NewMySQLConfigFromEnv()
+	if err != nil {
+		logger.Fatalf("mysql config: %v", err)
+	}
+	paths, err := userprogram.NewPathsFromEnv()
+	if err != nil {
+		logger.Fatalf("paths config: %v", err)
+	}
+
 	ctx, cancel := context.WithTimeout(context.Background(), defaultTimeout)
 	defer cancel()
 
-	updateDir := env("USER_PROGRAM_UPDATE_DIR", defaultUpdateDir)
-	logDir := env("USER_PROGRAM_IMPORT_LOG_DIR", defaultLogDir)
-	schema := env("USER_PROGRAM_INFO_SCHEMA", defaultSchema)
-
-	ensureDir(updateDir, logger)
-	ensureDir(logDir, logger)
-
-	if err := runCmd(ctx, logger, "user-program-dump", map[string]string{
-		"USER_PROGRAM_UPDATE_DIR": updateDir,
+	if err := userprogram.Sync(ctx, userprogram.SyncConfig{
+		MySQL:       mysqlCfg,
+		DatabaseURL: dbURL,
+		InitialCSV:  paths.InitialCSV,
+		UpdateDir:   paths.UpdateDir,
+		LogDir:      paths.LogDir,
+		Schema:      paths.Schema,
+		Logger:      logger,
 	}); err != nil {
-		logger.Fatalf("dump failed: %v", err)
-	}
-
-	if err := runCmd(ctx, logger, "user-program-import", map[string]string{
-		"USER_PROGRAM_UPDATE_DIR":     updateDir,
-		"USER_PROGRAM_IMPORT_LOG_DIR": logDir,
-		"USER_PROGRAM_INFO_SCHEMA":    schema,
-	}); err != nil {
-		logger.Fatalf("import failed: %v", err)
-	}
-
-	logger.Printf("sync completed (update_dir=%s, log_dir=%s, schema=%s)", updateDir, logDir, schema)
-}
-
-func runCmd(ctx context.Context, logger *log.Logger, command string, extraEnv map[string]string) error {
-	cmd := exec.CommandContext(ctx, command)
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	cmd.Env = os.Environ()
-	for k, v := range extraEnv {
-		if v == "" {
-			continue
-		}
-		cmd.Env = append(cmd.Env, k+"="+v)
-	}
-	logger.Printf("running %s", filepath.Base(command))
-	return cmd.Run()
-}
-
-func ensureDir(path string, logger *log.Logger) {
-	if err := os.MkdirAll(path, 0o755); err != nil {
-		logger.Fatalf("failed to create dir %s: %v", path, err)
+		logger.Fatalf("sync failed: %v", err)
 	}
 }
-
-func env(key, fallback string) string {
-	if v := os.Getenv(key); v != "" {
-		return v
-	}
-	return fallback
-}