mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-20 21:33:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

Use uri.path so we don't have file: in the filename

Browse source
This commit is contained in:
Kegan Dougal 2020-05-21 19:10:01 +01:00
parent f223da2f35
commit 74a2fc5576
9 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
appservice/storage/storage_wasm.go
View file

@ -34,7 +34,7 @@ func NewDatabase(
case "postgres": case "postgres":
return nil, fmt.Errorf("Cannot use postgres implementation") return nil, fmt.Errorf("Cannot use postgres implementation")
case "file": case "file":
return sqlite3.NewDatabase(dataSourceName) return sqlite3.NewDatabase(uri.Path)
default: default:
return nil, fmt.Errorf("Cannot use postgres implementation") return nil, fmt.Errorf("Cannot use postgres implementation")
} }

2
clientapi/auth/storage/accounts/storage_wasm.go
View file

@ -36,7 +36,7 @@ func NewDatabase(
case "postgres": case "postgres":
return nil, fmt.Errorf("Cannot use postgres implementation") return nil, fmt.Errorf("Cannot use postgres implementation")
case "file": case "file":
return sqlite3.NewDatabase(dataSourceName, serverName) return sqlite3.NewDatabase(uri.Path, serverName)
default: default:
return nil, fmt.Errorf("Cannot use postgres implementation") return nil, fmt.Errorf("Cannot use postgres implementation")
} }

2
clientapi/auth/storage/devices/storage_wasm.go
View file

@ -36,7 +36,7 @@ func NewDatabase(
case "postgres": case "postgres":
return nil, fmt.Errorf("Cannot use postgres implementation") return nil, fmt.Errorf("Cannot use postgres implementation")
case "file": case "file":
return sqlite3.NewDatabase(dataSourceName, serverName) return sqlite3.NewDatabase(uri.Path, serverName)
default: default:
return nil, fmt.Errorf("Cannot use postgres implementation") return nil, fmt.Errorf("Cannot use postgres implementation")
} }

20
cmd/dendritejs/main.go
View file

@ -163,16 +163,16 @@ func main() {
cfg := &config.Dendrite{} cfg := &config.Dendrite{}
cfg.SetDefaults() cfg.SetDefaults()
cfg.Kafka.UseNaffka = true cfg.Kafka.UseNaffka = true
cfg.Database.Account = "file:dendritejs_account.db" cfg.Database.Account = "file:/idb/dendritejs_account.db"
cfg.Database.AppService = "file:dendritejs_appservice.db" cfg.Database.AppService = "file:/idb/dendritejs_appservice.db"
cfg.Database.Device = "file:dendritejs_device.db" cfg.Database.Device = "file:/idb/dendritejs_device.db"
cfg.Database.FederationSender = "file:dendritejs_fedsender.db" cfg.Database.FederationSender = "file:/idb/dendritejs_fedsender.db"
cfg.Database.MediaAPI = "file:dendritejs_mediaapi.db" cfg.Database.MediaAPI = "file:/idb/dendritejs_mediaapi.db"
cfg.Database.Naffka = "file:dendritejs_naffka.db" cfg.Database.Naffka = "file:/idb/dendritejs_naffka.db"
cfg.Database.PublicRoomsAPI = "file:dendritejs_publicrooms.db" cfg.Database.PublicRoomsAPI = "file:/idb/dendritejs_publicrooms.db"
cfg.Database.RoomServer = "file:dendritejs_roomserver.db" cfg.Database.RoomServer = "file:/idb/dendritejs_roomserver.db"
cfg.Database.ServerKey = "file:dendritejs_serverkey.db" cfg.Database.ServerKey = "file:/idb/dendritejs_serverkey.db"
cfg.Database.SyncAPI = "file:dendritejs_syncapi.db" cfg.Database.SyncAPI = "file:/idb/dendritejs_syncapi.db"
cfg.Kafka.Topics.UserUpdates = "user_updates" cfg.Kafka.Topics.UserUpdates = "user_updates"
cfg.Kafka.Topics.OutputTypingEvent = "output_typing_event" cfg.Kafka.Topics.OutputTypingEvent = "output_typing_event"
cfg.Kafka.Topics.OutputClientData = "output_client_data" cfg.Kafka.Topics.OutputClientData = "output_client_data"

2
federationsender/storage/storage_wasm.go
View file

@ -33,7 +33,7 @@ func NewDatabase(
} }
switch uri.Scheme { switch uri.Scheme {
case "file": case "file":
return sqlite3.NewDatabase(dataSourceName) return sqlite3.NewDatabase(uri.Path)
case "postgres": case "postgres":
return nil, fmt.Errorf("Cannot use postgres implementation") return nil, fmt.Errorf("Cannot use postgres implementation")
default: default:

2
internal/basecomponent/base.go
View file

@ -255,7 +255,7 @@ func setupNaffka(cfg *config.Dendrite) (sarama.Consumer, sarama.SyncProducer) {
uri, err := url.Parse(string(cfg.Database.Naffka)) uri, err := url.Parse(string(cfg.Database.Naffka))
if err != nil || uri.Scheme == "file" { if err != nil || uri.Scheme == "file" {
db, err = sqlutil.Open(internal.SQLiteDriverName(), string(cfg.Database.Naffka), nil) db, err = sqlutil.Open(internal.SQLiteDriverName(), string(uri.Path), nil)
if err != nil { if err != nil {
logrus.WithError(err).Panic("Failed to open naffka database") logrus.WithError(err).Panic("Failed to open naffka database")
} }

2
internal/keydb/keydb_wasm.go
View file

@ -41,7 +41,7 @@ func NewDatabase(
case "postgres": case "postgres":
return nil, fmt.Errorf("Cannot use postgres implementation") return nil, fmt.Errorf("Cannot use postgres implementation")
case "file": case "file":
return sqlite3.NewDatabase(dataSourceName, serverName, serverKey, serverKeyID) return sqlite3.NewDatabase(uri.Path, serverName, serverKey, serverKeyID)
default: default:
return nil, fmt.Errorf("Cannot use postgres implementation") return nil, fmt.Errorf("Cannot use postgres implementation")
} }

2
mediaapi/storage/storage_wasm.go
View file

@ -35,7 +35,7 @@ func Open(
case "postgres": case "postgres":
return nil, fmt.Errorf("Cannot use postgres implementation") return nil, fmt.Errorf("Cannot use postgres implementation")
case "file": case "file":
return sqlite3.Open(dataSourceName) return sqlite3.Open(uri.Path)
default: default:
return nil, fmt.Errorf("Cannot use postgres implementation") return nil, fmt.Errorf("Cannot use postgres implementation")
} }

2
publicroomsapi/storage/storage_wasm.go
View file

@ -31,7 +31,7 @@ func NewPublicRoomsServerDatabase(dataSourceName string) (Database, error) {
case "postgres": case "postgres":
return nil, fmt.Errorf("Cannot use postgres implementation") return nil, fmt.Errorf("Cannot use postgres implementation")
case "file": case "file":
return sqlite3.NewPublicRoomsServerDatabase(dataSourceName) return sqlite3.NewPublicRoomsServerDatabase(uri.Path)
default: default:
return nil, fmt.Errorf("Cannot use postgres implementation") return nil, fmt.Errorf("Cannot use postgres implementation")
} }