feat: run on a single port (#3163)

* start v2

* start

* run

* some cleanup

* remove v2 pkg again

* simplify

* webauthn

* remove unused config

* fix login path in Dockerfile

* fix asset_generator.go

* health handler

* fix grpc web

* refactor

* merge

* build new main.go

* run new main.go

* update logging pkg

* fix error msg

* update logging

* cleanup

* cleanup

* go mod tidy

* change localDevMode

* fix customEndpoints

* update logging

* comments

* change local flag to external configs

* fix location generated go code

* fix

Co-authored-by: fforootd <[email protected]>
This commit is contained in:
Livio Amstutz
2022-02-14 17:22:30 +01:00
committed by GitHub
co-authored by fforootd
parent 2f3a482ade
commit 389eb4a27a
306 changed files with 1708 additions and 1567 deletions
+3 -3
View File
@@ -2,9 +2,9 @@ package database
import (
"strings"
"time"
"github.com/caos/logging"
"github.com/caos/zitadel/internal/config/types"
)
const (
@@ -19,8 +19,8 @@ type Config struct {
Database string
SSL SSL
MaxOpenConns uint32
MaxConnLifetime types.Duration
MaxConnIdleTime types.Duration
MaxConnLifetime time.Duration
MaxConnIdleTime time.Duration
//Additional options to be appended as options=<Options>
//The value will be taken as is. Multiple options are space separated.
+2 -2
View File
@@ -11,8 +11,8 @@ func Connect(config Config) (*sql.DB, error) {
}
client.SetMaxOpenConns(int(config.MaxOpenConns))
client.SetConnMaxLifetime(config.MaxConnLifetime.Duration)
client.SetConnMaxIdleTime(config.MaxConnIdleTime.Duration)
client.SetConnMaxLifetime(config.MaxConnLifetime)
client.SetConnMaxIdleTime(config.MaxConnIdleTime)
return client, nil
}