TheArchive/zitadel
1
0
Fork 0
mirror of https://github.com/zitadel/zitadel.git synced 2025-08-11 20:37:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix merge

Browse Source
This commit is contained in:
Livio Spring
2025-05-02 13:44:24 +02:00
parent 4c5769355b
commit 573c96d6af
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/start/start.go
View File

@@ -4,7 +4,6 @@ import (
"context" "context"
"crypto/tls" "crypto/tls"
_ "embed" _ "embed"
"errors"
"fmt" "fmt"
"math" "math"
"net/http" "net/http"
@@ -271,9 +270,6 @@ func startZitadel(ctx context.Context, config *Config, masterKey string, server
actionsLogstoreSvc := logstore.New(queries, actionsExecutionDBEmitter, actionsExecutionStdoutEmitter) actionsLogstoreSvc := logstore.New(queries, actionsExecutionDBEmitter, actionsExecutionStdoutEmitter)
actions.SetLogstoreService(actionsLogstoreSvc) actions.SetLogstoreService(actionsLogstoreSvc)
if !config.Notifications.LegacyEnabled && dbClient.Type() == "cockroach" {
return errors.New("notifications must be set to LegacyEnabled=true when using CockroachDB")
}
q, err := queue.NewQueue(&queue.Config{ q, err := queue.NewQueue(&queue.Config{
Client: dbClient, Client: dbClient,
}) })

3
internal/queue/queue.go
View File

@@ -27,9 +27,6 @@ type Config struct {
} }
func NewQueue(config *Config) (_ *Queue, err error) { func NewQueue(config *Config) (_ *Queue, err error) {
if config.Client.Type() == "cockroach" {
return nil, nil
}
return &Queue{ return &Queue{
driver: riverpgxv5.New(config.Client.Pool), driver: riverpgxv5.New(config.Client.Pool),
config: &river.Config{ config: &river.Config{