mirror of
https://github.com/zitadel/zitadel.git
synced 2025-08-12 01:37:31 +00:00
* push with timeout
* test: config for eventstore
(cherry picked from commit b9156da76d
)
Co-authored-by: Silvan <silvan.reusser@gmail.com>
This commit is contained in:
@@ -320,6 +320,9 @@ Actions:
|
||||
- localhost
|
||||
- "127.0.0.1"
|
||||
|
||||
Eventstore:
|
||||
PushTimeout: 15s
|
||||
|
||||
DefaultInstance:
|
||||
InstanceName:
|
||||
DefaultLanguage: en
|
||||
|
@@ -62,7 +62,7 @@ func Setup(config *Config, steps *Steps, masterKey string) {
|
||||
dbClient, err := database.Connect(config.Database, false)
|
||||
logging.OnError(err).Fatal("unable to connect to database")
|
||||
|
||||
eventstoreClient, err := eventstore.Start(dbClient)
|
||||
eventstoreClient, err := eventstore.Start(&eventstore.Config{Client: dbClient})
|
||||
logging.OnError(err).Fatal("unable to start eventstore")
|
||||
migration.RegisterMappers(eventstoreClient)
|
||||
|
||||
|
@@ -22,6 +22,7 @@ import (
|
||||
"github.com/zitadel/zitadel/internal/config/systemdefaults"
|
||||
"github.com/zitadel/zitadel/internal/crypto"
|
||||
"github.com/zitadel/zitadel/internal/database"
|
||||
"github.com/zitadel/zitadel/internal/eventstore"
|
||||
"github.com/zitadel/zitadel/internal/id"
|
||||
"github.com/zitadel/zitadel/internal/query/projection"
|
||||
static_config "github.com/zitadel/zitadel/internal/static/config"
|
||||
@@ -60,6 +61,7 @@ type Config struct {
|
||||
CustomerPortal string
|
||||
Machine *id.Config
|
||||
Actions *actions.Config
|
||||
Eventstore *eventstore.Config
|
||||
}
|
||||
|
||||
func MustNewConfig(v *viper.Viper) *Config {
|
||||
|
@@ -99,7 +99,8 @@ func startZitadel(config *Config, masterKey string) error {
|
||||
return err
|
||||
}
|
||||
|
||||
eventstoreClient, err := eventstore.Start(dbClient)
|
||||
config.Eventstore.Client = dbClient
|
||||
eventstoreClient, err := eventstore.Start(config.Eventstore)
|
||||
if err != nil {
|
||||
return fmt.Errorf("cannot start eventstore for queries: %w", err)
|
||||
}
|
||||
|
Reference in New Issue
Block a user