mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-16 03:13:11 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix behaviour so that it really tries postgres when URL parsing fails and it complains about unknown schema if it succeeds

Browse source
This commit is contained in:
Neil Alexander 2020-01-09 17:01:59 +00:00
parent feef9c124c
commit 6ab581c2af
6 changed files with 30 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
common/keydb/keydb.go
View file

@ -16,6 +16,7 @@ package keydb
import (
"context"
"errors"
"net/url"
"github.com/matrix-org/dendrite/common/keydb/postgres"
@ -32,14 +33,14 @@ type Database interface {
func NewDatabase(dataSourceName string) (Database, error) {
uri, err := url.Parse(dataSourceName)
if err != nil {
return nil, err
// if the scheme doesn't match, fall back to postgres in case the config has
// postgres key=value connection strings
return postgres.NewDatabase(dataSourceName)
}
switch uri.Scheme {
case "postgres":
return postgres.NewDatabase(dataSourceName)
default:
// if the scheme doesn't match, fall back to postgres in case the config has
// postgres key=value connection strings
return postgres.NewDatabase(dataSourceName)
return nil, errors.New("unknown schema")
}
}

9
federationsender/storage/storage.go
View file

@ -16,6 +16,7 @@ package storage
import (
"context"
"errors"
"net/url"
"github.com/matrix-org/dendrite/common"
@ -33,14 +34,14 @@ type Database interface {
func NewDatabase(dataSourceName string) (Database, error) {
uri, err := url.Parse(dataSourceName)
if err != nil {
return nil, err
// if the scheme doesn't match, fall back to postgres in case the config has
// postgres key=value connection strings
return postgres.NewDatabase(dataSourceName)
}
switch uri.Scheme {
case "postgres":
return postgres.NewDatabase(dataSourceName)
default:
// if the scheme doesn't match, fall back to postgres in case the config has
// postgres key=value connection strings
return postgres.NewDatabase(dataSourceName)
return errors.New("unknown schema")
}
}

9
mediaapi/storage/storage.go
View file

@ -16,6 +16,7 @@ package storage
import (
"context"
"errors"
"net/url"
"github.com/matrix-org/dendrite/mediaapi/storage/postgres"
@ -35,14 +36,14 @@ type Database interface {
func Open(dataSourceName string) (Database, error) {
uri, err := url.Parse(dataSourceName)
if err != nil {
return nil, err
// if the scheme doesn't match, fall back to postgres in case the config has
// postgres key=value connection strings
return postgres.Open(dataSourceName)
}
switch uri.Scheme {
case "postgres":
return postgres.Open(dataSourceName)
default:
// if the scheme doesn't match, fall back to postgres in case the config has
// postgres key=value connection strings
return postgres.Open(dataSourceName)
return nil, errors.New("unknown schema")
}
}

9
publicroomsapi/storage/storage.go
View file

@ -16,6 +16,7 @@ package storage
import (
"context"
"errors"
"net/url"
"github.com/matrix-org/dendrite/common"
@ -38,14 +39,14 @@ type Database interface {
func NewPublicRoomsServerDatabase(dataSourceName string) (Database, error) {
uri, err := url.Parse(dataSourceName)
if err != nil {
return nil, err
// if the scheme doesn't match, fall back to postgres in case the config has
// postgres key=value connection strings
return postgres.NewPublicRoomsServerDatabase(dataSourceName)
}
switch uri.Scheme {
case "postgres":
return postgres.NewPublicRoomsServerDatabase(dataSourceName)
default:
// if the scheme doesn't match, fall back to postgres in case the config has
// postgres key=value connection strings
return postgres.NewPublicRoomsServerDatabase(dataSourceName)
return nil, errors.New("unknown schema")
}
}

9
roomserver/storage/storage.go
View file

@ -16,6 +16,7 @@ package storage
import (
"context"
"errors"
"net/url"
"github.com/matrix-org/dendrite/roomserver/api"
@ -60,14 +61,14 @@ type Database interface {
func Open(dataSourceName string) (Database, error) {
uri, err := url.Parse(dataSourceName)
if err != nil {
return nil, err
// if the scheme doesn't match, fall back to postgres in case the config has
// postgres key=value connection strings
return postgres.Open(dataSourceName)
}
switch uri.Scheme {
case "postgres":
return postgres.Open(dataSourceName)
default:
// if the scheme doesn't match, fall back to postgres in case the config has
// postgres key=value connection strings
return postgres.Open(dataSourceName)
return nil, errors.New("unknown schema")
}
}

9
syncapi/storage/storage.go
View file

@ -16,6 +16,7 @@ package storage
import (
"context"
"errors"
"net/url"
"time"
@ -51,14 +52,14 @@ type Database interface {
func NewSyncServerDatasource(dataSourceName string) (Database, error) {
uri, err := url.Parse(dataSourceName)
if err != nil {
return nil, err
// if the scheme doesn't match, fall back to postgres in case the config has
// postgres key=value connection strings
return postgres.NewSyncServerDatasource(dataSourceName)
}
switch uri.Scheme {
case "postgres":
return postgres.NewSyncServerDatasource(dataSourceName)
default:
// if the scheme doesn't match, fall back to postgres in case the config has
// postgres key=value connection strings
return postgres.NewSyncServerDatasource(dataSourceName)
return nil, errors.New("unknown schema")
}
}