diff options
| author | 0x1a8510f2 <admin@0x1a8510f2.space> | 2022-11-02 13:20:10 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-02 13:20:10 +0000 |
| commit | 51ab0a8ccfab539e127df0d97c29f364fbb57864 (patch) | |
| tree | 6a0f81ee06e00ac8f9d65539e19f22ba0af1e54d /cmd | |
| parent | 16c2a9590002a2124cf7dae69da07aab0f13a5a8 (diff) | |
Fix `moderncsqlite` errors and rebase onto `main` (#2832)
This is #2819 but rebased on latest `main`. This PR is against main too
as opposed to the `moderncsqlite` branch.
The main change here is simply:
```go
// add query parameters to the dsn
if strings.Contains(dsn, "?") {
dsn += "&"
} else {
dsn += "?"
}
// wait some time before erroring if the db is locked
// https://gitlab.com/cznic/sqlite/-/issues/106#note_1058094993
dsn += "_pragma=busy_timeout%3d10000"
```
### Pull Request Checklist
<!-- Please read
https://matrix-org.github.io/dendrite/development/contributing before
submitting your pull request -->
* [x] I have added tests for PR _or_ I have justified why this PR
doesn't need tests.
* [x] Pull request includes a [sign off below using a legally
identifiable
name](https://matrix-org.github.io/dendrite/development/contributing#sign-off)
_or_ I have already signed off privately
Signed off privately.
Co-authored-by: Neil Alexander <neilalexander@users.noreply.github.com>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/dendrite-demo-pinecone/main.go | 2 | ||||
| -rw-r--r-- | cmd/dendrite-demo-yggdrasil/main.go | 2 | ||||
| -rw-r--r-- | cmd/dendrite-monolith-server/main.go | 2 | ||||
| -rw-r--r-- | cmd/dendrite-polylith-multi/main.go | 2 |
4 files changed, 0 insertions, 8 deletions
diff --git a/cmd/dendrite-demo-pinecone/main.go b/cmd/dendrite-demo-pinecone/main.go index be34365b..6c719a1e 100644 --- a/cmd/dendrite-demo-pinecone/main.go +++ b/cmd/dendrite-demo-pinecone/main.go @@ -54,8 +54,6 @@ import ( pineconeSessions "github.com/matrix-org/pinecone/sessions" "github.com/sirupsen/logrus" - - _ "github.com/mattn/go-sqlite3" ) var ( diff --git a/cmd/dendrite-demo-yggdrasil/main.go b/cmd/dendrite-demo-yggdrasil/main.go index 38c25cde..1226496c 100644 --- a/cmd/dendrite-demo-yggdrasil/main.go +++ b/cmd/dendrite-demo-yggdrasil/main.go @@ -48,8 +48,6 @@ import ( "github.com/matrix-org/dendrite/test" "github.com/matrix-org/dendrite/userapi" "github.com/sirupsen/logrus" - - _ "github.com/mattn/go-sqlite3" ) var ( diff --git a/cmd/dendrite-monolith-server/main.go b/cmd/dendrite-monolith-server/main.go index 845b9e46..ff980dc1 100644 --- a/cmd/dendrite-monolith-server/main.go +++ b/cmd/dendrite-monolith-server/main.go @@ -30,8 +30,6 @@ import ( "github.com/matrix-org/dendrite/userapi" uapi "github.com/matrix-org/dendrite/userapi/api" "github.com/sirupsen/logrus" - - _ "github.com/mattn/go-sqlite3" ) var ( diff --git a/cmd/dendrite-polylith-multi/main.go b/cmd/dendrite-polylith-multi/main.go index e4845f64..c6a560b1 100644 --- a/cmd/dendrite-polylith-multi/main.go +++ b/cmd/dendrite-polylith-multi/main.go @@ -24,8 +24,6 @@ import ( "github.com/matrix-org/dendrite/setup/base" "github.com/matrix-org/dendrite/setup/config" "github.com/sirupsen/logrus" - - _ "github.com/mattn/go-sqlite3" ) type entrypoint func(base *base.BaseDendrite, cfg *config.Dendrite) |