aboutsummaryrefslogtreecommitdiffhomepage
path: root/backend/cmd_serve.go
diff options
context:
space:
mode:
Diffstat (limited to 'backend/cmd_serve.go')
-rw-r--r--backend/cmd_serve.go16
1 files changed, 4 insertions, 12 deletions
diff --git a/backend/cmd_serve.go b/backend/cmd_serve.go
index bb3d274..1421696 100644
--- a/backend/cmd_serve.go
+++ b/backend/cmd_serve.go
@@ -138,12 +138,7 @@ func scheduled(ctx context.Context, d time.Duration, fn func()) {
}()
}
-func runServe(database *sql.DB) {
- port := os.Getenv("FEEDAKA_PORT")
- if port == "" {
- port = "8080"
- }
-
+func runServe(database *sql.DB, config *Config) {
err := db.ValidateSchemaVersion(database)
if err != nil {
log.Fatal(err)
@@ -151,10 +146,7 @@ func runServe(database *sql.DB) {
queries := db.New(database)
- sessionConfig, err := auth.NewSessionConfig()
- if err != nil {
- log.Fatal(err)
- }
+ sessionConfig := auth.NewSessionConfig(config.SessionSecret, config.DevNonSecureCookie)
e := echo.New()
@@ -233,8 +225,8 @@ func runServe(database *sql.DB) {
}
}()
- log.Printf("Server starting on port %s...\n", port)
- err = e.Start(":" + port)
+ log.Printf("Server starting on port %s...\n", config.Port)
+ err = e.Start(":" + config.Port)
if err != nil && err != http.ErrServerClosed {
log.Printf("Server error: %v\n", err)
}