diff options
| author |  tobi <31960611+tsmethurst@users.noreply.github.com> | 2023-01-18 14:37:52 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2023-01-18 14:37:52 +0100 |
| commit | 974ec80a206f4e797e88dbb3a429b53667e327c5 (patch) | |
| tree | 882eca713a79f065d39e539d60fba751756451e2 | |
| parent | [feature] Inherit resource limits from cgroups (#1336) (diff) | |
| download | gotosocial-974ec80a206f4e797e88dbb3a429b53667e327c5.tar.xz | |
[chore] Change default sqlite busy timeout to 5m (#1352)
| -rw-r--r-- | docs/configuration/database.md | 2 | ||||
| -rw-r--r-- | example/config.yaml | 2 | ||||
| -rw-r--r-- | internal/config/defaults.go | 2 | ||||
| -rw-r--r-- | testrig/config.go | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/docs/configuration/database.md b/docs/configuration/database.md index 90487c17b..38514e036 100644 --- a/docs/configuration/database.md +++ b/docs/configuration/database.md @@ -138,5 +138,5 @@ db-sqlite-cache-size: "64MiB" # See: https://www.sqlite.org/pragma.html#pragma_busy_timeout # Examples: ["0s", "1s", "30s", "1m", "5m"] # Default: "5s" -db-sqlite-busy-timeout: "30s" +db-sqlite-busy-timeout: "5m" ``` diff --git a/example/config.yaml b/example/config.yaml index 5ce622a88..5b2aacc1c 100644 --- a/example/config.yaml +++ b/example/config.yaml @@ -194,7 +194,7 @@ db-sqlite-cache-size: "64MiB" # See: https://www.sqlite.org/pragma.html#pragma_busy_timeout # Examples: ["0s", "1s", "30s", "1m", "5m"] # Default: "5s" -db-sqlite-busy-timeout: "30s" +db-sqlite-busy-timeout: "5m" cache: gts: diff --git a/internal/config/defaults.go b/internal/config/defaults.go index 31f282113..3cd1a3ed3 100644 --- a/internal/config/defaults.go +++ b/internal/config/defaults.go @@ -51,7 +51,7 @@ var Defaults = Configuration{ DbSqliteJournalMode: "WAL", DbSqliteSynchronous: "NORMAL", DbSqliteCacheSize: 64 * bytesize.MiB, - DbSqliteBusyTimeout: time.Second * 30, + DbSqliteBusyTimeout: time.Minute * 5, WebTemplateBaseDir: "./web/template/", WebAssetBaseDir: "./web/assets/", diff --git a/testrig/config.go b/testrig/config.go index 315e52bb9..08c1feb06 100644 --- a/testrig/config.go +++ b/testrig/config.go @@ -55,7 +55,7 @@ var testDefaults = config.Configuration{ DbSqliteJournalMode: "WAL", DbSqliteSynchronous: "NORMAL", DbSqliteCacheSize: 64 * bytesize.MiB, - DbSqliteBusyTimeout: time.Second * 30, + DbSqliteBusyTimeout: time.Minute * 5, WebTemplateBaseDir: "./web/template/", WebAssetBaseDir: "./web/assets/", |