ServeConversions and UseHikariConnectionPool

This commit is contained in:
Syer10
2025-11-12 16:38:10 -05:00
parent 7faeea249b
commit 55640f144c
3 changed files with 9 additions and 1 deletions

View File

@@ -140,6 +140,7 @@ jobs:
-e AUTO_DOWNLOAD_NEW_CHAPTERS_LIMIT=5 \
-e AUTO_DOWNLOAD_IGNORE_REUPLOADS=false \
-e DOWNLOAD_CONVERSIONS="{ \"image/filetype\" = { target = \"image/filetype\" }, \"image/filetype\" = { target = \"image/filetype\" } }" \
-e SERVE_CONVERSIONS="{ \"image/filetype\" = { target = \"image/filetype\" }, \"image/filetype\" = { target = \"image/filetype\" } }" \
-e EXTENSION_REPOS=[\"http://github.com/orginazation-name/repo-name\",\"http://github.com/orginazation-name-2/repo-name-2\"] \
-e MAX_SOURCES_IN_PARALLEL=12 \
-e UPDATE_EXCLUDE_UNREAD=false \
@@ -183,6 +184,7 @@ jobs:
-e DATABASE_URL=postgresql://localhost:5432/suwayomi \
-e DATABASE_USERNAME=manga \
-e DATABASE_PASSWORD=hello123 \
-e USE_HIKARI_CONNECTION_POOL=false \
--name=suwayomi_test \
${{ env.test_image_tag }}
sleep 15

View File

@@ -65,7 +65,8 @@ There are a number of environment variables available to configure Suwayomi:
| **AUTO_DOWNLOAD_EXCLUDE_UNREAD** | `true` | Ignore automatic chapter downloads of entries with unread chapters |
| **AUTO_DOWNLOAD_NEW_CHAPTERS_LIMIT** | `0` | 0 to disable - how many unread downloaded chapters should be available - if the limit is reached, new chapters won't be downloaded automatically |
| **AUTO_DOWNLOAD_IGNORE_REUPLOADS** | `false` | Decides if re-uploads should be ignored during auto download of new chapters chapters |
| **DOWNLOAD_CONVERSIONS** | `{}` | Image download conversions, the format is `{ "image/filetype" = { target = "image/filetype" }, "image/filetype" = { target = "image/filetype", compressionLevel=0.6 } }`. You can also use `default` instead of `image/filetype` to add a default conversion handler. |
| **DOWNLOAD_CONVERSIONS** | `{}` | Image download conversions, please see [the wiki](https://github.com/Suwayomi/Suwayomi-Server/wiki/Configuring-Suwayomi%E2%80%90Server#downloader) for more information. |
| **SERVE_CONVERSIONS** | `{}` | Image serve conversions, please see [the wiki](https://github.com/Suwayomi/Suwayomi-Server/wiki/Configuring-Suwayomi%E2%80%90Server#downloader) for more information. |
| **EXTENSION_REPOS** | `[]` | Any additional extension repos to use, the format is `["https://github.com/MY_ACCOUNT/MY_REPO/tree/repo", "https://github.com/MY_ACCOUNT_2/MY_REPO_2/"]` |
| **MAX_SOURCES_IN_PARALLEL** | `6` | Range: 1 <= n <= 20 - Sets how many sources can do requests (updates, downloads) in parallel. Updates/Downloads are grouped by source and all mangas of a source are updated/downloaded synchronously |
| **UPDATE_EXCLUDE_UNREAD** | `true` | If unread manga should be excluded from updates |
@@ -109,6 +110,7 @@ There are a number of environment variables available to configure Suwayomi:
| **DATABASE_URL** | `postgresql://localhost:5432/suwayomi` | The URL of the database, only used for non-h2 database |
| **DATABASE_USERNAME** | ` ` | Database username, only used for non-h2 database |
| **DATABASE_PASSWORD** | ` ` | Database password, only used for non-h2 database |
| **USE_HIKARI_CONNECTION_POOL** | `true` | Use Hikari Connection Pool to connect to the database. |
> [!CAUTION]

View File

@@ -49,6 +49,9 @@ sed -i -r "s/server.autoDownloadIgnoreReUploads = ([0-9]+|[a-zA-Z]+)( #)?/server
if [ -n "$DOWNLOAD_CONVERSIONS" ]; then
perl -0777 -i -pe 's/server\.downloadConversions = ({[^#]*?}}?)/server.downloadConversions = $ENV{DOWNLOAD_CONVERSIONS}/gs' /home/suwayomi/.local/share/Tachidesk/server.conf
fi
if [ -n "$SERVE_CONVERSIONS" ]; then
perl -0777 -i -pe 's/server\.serveConversions = ({[^#]*?}}?)/server.serveConversions = $ENV{SERVE_CONVERSIONS}/gs' /home/suwayomi/.local/share/Tachidesk/server.conf
fi
# extension repos
if [ -n "$EXTENSION_REPOS" ]; then
@@ -132,6 +135,7 @@ sed -i -r "s/server.databaseType = \"*([a-zA-Z0-9_]+)\"*( #)?/server.databaseTyp
sed -i -r "s|server.databaseUrl = \"(.*?)\"( #)?|server.databaseUrl = \"${DATABASE_URL:-\1}\" #|" /home/suwayomi/.local/share/Tachidesk/server.conf
sed -i -r "s/server.databaseUsername = \"(.*?)\"( #)?/server.databaseUsername = \"${DATABASE_USERNAME:-\1}\" #/" /home/suwayomi/.local/share/Tachidesk/server.conf
sed -i -r "s/server.databasePassword = \"(.*?)\"( #)?/server.databasePassword = \"${DATABASE_PASSWORD:-\1}\" #/" /home/suwayomi/.local/share/Tachidesk/server.conf
sed -i -r "s/server.useHikariConnectionPool = ([0-9]+|[a-zA-Z]+)( #)?/server.useHikariConnectionPool = ${USE_HIKARI_CONNECTION_POOL:-\1} #/" /home/suwayomi/.local/share/Tachidesk/server.conf
rm -rf /home/suwayomi/.local/share/Tachidesk/cache/kcef/Singleton*