diff options
| -rw-r--r-- | backend/cmd_serve.go | 9 | ||||
| -rw-r--r-- | backend/config/config.go (renamed from backend/config.go) | 2 | ||||
| -rw-r--r-- | backend/main.go | 6 |
3 files changed, 10 insertions, 7 deletions
diff --git a/backend/cmd_serve.go b/backend/cmd_serve.go index 1421696..a0a2d75 100644 --- a/backend/cmd_serve.go +++ b/backend/cmd_serve.go @@ -24,6 +24,7 @@ import ( "github.com/vektah/gqlparser/v2/ast" "undef.ninja/x/feedaka/auth" + "undef.ninja/x/feedaka/config" "undef.ninja/x/feedaka/db" "undef.ninja/x/feedaka/graphql" "undef.ninja/x/feedaka/graphql/resolver" @@ -138,7 +139,7 @@ func scheduled(ctx context.Context, d time.Duration, fn func()) { }() } -func runServe(database *sql.DB, config *Config) { +func runServe(database *sql.DB, cfg *config.Config) { err := db.ValidateSchemaVersion(database) if err != nil { log.Fatal(err) @@ -146,7 +147,7 @@ func runServe(database *sql.DB, config *Config) { queries := db.New(database) - sessionConfig := auth.NewSessionConfig(config.SessionSecret, config.DevNonSecureCookie) + sessionConfig := auth.NewSessionConfig(cfg.SessionSecret, cfg.DevNonSecureCookie) e := echo.New() @@ -225,8 +226,8 @@ func runServe(database *sql.DB, config *Config) { } }() - log.Printf("Server starting on port %s...\n", config.Port) - err = e.Start(":" + config.Port) + log.Printf("Server starting on port %s...\n", cfg.Port) + err = e.Start(":" + cfg.Port) if err != nil && err != http.ErrServerClosed { log.Printf("Server error: %v\n", err) } diff --git a/backend/config.go b/backend/config/config.go index c66100e..7f2607d 100644 --- a/backend/config.go +++ b/backend/config/config.go @@ -1,4 +1,4 @@ -package main +package config import ( "errors" diff --git a/backend/main.go b/backend/main.go index 714d496..e392a33 100644 --- a/backend/main.go +++ b/backend/main.go @@ -6,13 +6,15 @@ import ( "log" _ "github.com/mattn/go-sqlite3" + + "undef.ninja/x/feedaka/config" ) //go:generate go tool sqlc generate //go:generate go tool gqlgen generate func main() { - config, err := LoadConfig() + cfg, err := config.LoadConfig() if err != nil { log.Fatal(err) } @@ -32,6 +34,6 @@ func main() { } else if *createUser { runCreateUser(database) } else { - runServe(database, config) + runServe(database, cfg) } } |