dendritejs tweaks for persisting sqlite DBs (#1058)

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

* New go-sqlite-js version
This commit is contained in:
Kegsay 2020-05-22 12:28:48 +01:00 committed by GitHub
parent fbdcfdd256
commit 3daa2327ed
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 21 additions and 19 deletions

View file

@ -264,7 +264,7 @@ func setupNaffka(cfg *config.Dendrite) (sarama.Consumer, sarama.SyncProducer) {
uri, err := url.Parse(string(cfg.Database.Naffka))
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 {
logrus.WithError(err).Panic("Failed to open naffka database")
}

View file

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