studio/flamenco
studio/flamenco
11
29
Fork 38
Code Issues 62 Pull Requests 8 Releases Wiki Activity

Sync branch magefile with main #104308

Merged
Sybren A. Stüvel merged 85 commits from abelli/flamenco:magefile into magefile 2024-05-13 16:26:32 +02:00
Conversation 0 Commits 85 Files Changed 145 +5 -1
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 7277286391 - Show all commits

6
cmd/flamenco-manager/main.go
View File

@ -56,6 +56,10 @@ const (
developmentWebInterfacePort = 8081 developmentWebInterfacePort = 8081
webappEntryPoint = "index.html" webappEntryPoint = "index.html"
// dbOpenTimeout is the time the persistence layer gets to open the database.
// This includes database migrations, which can take some time to perform.
dbOpenTimeout = 1 * time.Minute
) )
type shutdownFunc func() type shutdownFunc func()
@ -379,7 +383,7 @@ func openDB(configService config.Service) *persistence.DB {
log.Fatal().Msg("configure the database in flamenco-manager.yaml") log.Fatal().Msg("configure the database in flamenco-manager.yaml")
} }
dbCtx, dbCtxCancel := context.WithTimeout(context.Background(), 5*time.Second) dbCtx, dbCtxCancel := context.WithTimeout(context.Background(), dbOpenTimeout)
defer dbCtxCancel() defer dbCtxCancel()
persist, err := persistence.OpenDB(dbCtx, dsn) persist, err := persistence.OpenDB(dbCtx, dsn)
if err != nil { if err != nil {