Fix init order. Reformat.

This commit is contained in:
2025-11-20 14:26:27 +01:00
parent 6239e7f19b
commit f7a0954213
2 changed files with 28 additions and 32 deletions

View File

@@ -424,8 +424,8 @@ func run() error {
// Initialize subsystems in dependency order:
// 1. Load environment variables from .env file (contains sensitive configuration)
// 2. Load configuration from config.json (may reference environment variables)
// 3. Initialize database connection (requires config for connection string)
// 4. Handle database commands if requested (requires active database connection)
// 3. Handle database migration commands if requested
// 4. Initialize database connection (requires config for connection string)
// 5. Handle user commands if requested (requires database and authentication config)
// 6. Initialize subsystems like archive and metrics (require config and database)
@@ -438,13 +438,13 @@ func run() error {
return err
}
// Initialize database
if err := initDatabase(); err != nil {
// Handle database migration (migrate, revert, force)
if err := handleDatabaseCommands(); err != nil {
return err
}
// Handle database commands (migrate, revert, force)
if err := handleDatabaseCommands(); err != nil {
// Initialize database
if err := initDatabase(); err != nil {
return err
}
@@ -458,7 +458,7 @@ func run() error {
return err
}
// Start server if requested
// Exit if start server is not requested
if !flagServer {
cclog.Exit("No errors, server flag not set. Exiting cc-backend.")
}
@@ -476,4 +476,3 @@ func main() {
os.Exit(1)
}
}

View File

@@ -39,9 +39,7 @@ import (
httpSwagger "github.com/swaggo/http-swagger"
)
var (
buildInfo web.Build
)
var buildInfo web.Build
// Environment variable names
const (
@@ -270,7 +268,6 @@ func (s *Server) init() error {
handlers.AllowedMethods([]string{"GET", "POST", "HEAD", "OPTIONS"}),
handlers.AllowedOrigins([]string{"*"})))
return nil
}