Elgato_dark/bunkerweb
1
0
Fork 0
mirror of https://github.com/bunkerity/bunkerweb synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refactor database version check and configuration update in scheduler scripts

Browse source
This commit is contained in:
Théophile Diot 2025-01-10 11:41:30 +01:00
parent 43b905fee2
commit 4a59ba51bb
No known key found for this signature in database
GPG key ID: FA995104A0BA376A
2 changed files with 44 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
src/linux/scripts/bunkerweb-scheduler.sh
View file

@ -90,14 +90,11 @@ function start() {
;;
esac
# Update configuration files
if sed -i "s|^sqlalchemy\\.url =.*$|sqlalchemy.url = $DATABASE_URI|" alembic.ini; then
if sed -i "s|^version_locations =.*$|version_locations = ${DATABASE}_versions|" alembic.ini; then
# Check current version and stamp
log "SYSTEMCTL" "ℹ️" "Checking database version..."
installed_version=$(cat /usr/share/bunkerweb/VERSION)
# Create temporary Python script
cat > /tmp/version_check.py << EOL
# Check current version and stamp
log "SYSTEMCTL" "ℹ️" "Checking database version..."
installed_version=$(cat /usr/share/bunkerweb/VERSION)
# Create temporary Python script
cat > /tmp/version_check.py << EOL
import sqlalchemy as sa
from os import getenv
@ -106,8 +103,8 @@ from logger import setup_logger
LOGGER = setup_logger('Scheduler', getenv('CUSTOM_LOG_LEVEL', getenv('LOG_LEVEL', 'INFO')))
engine = Database(LOGGER).sql_engine
with engine.connect() as conn:
db = Database(LOGGER)
with db.sql_engine.connect() as conn:
try:
result = conn.execute(sa.text('SELECT version FROM bw_metadata WHERE id = 1'))
print(next(result)[0])
@ -116,16 +113,26 @@ with engine.connect() as conn:
print('none')
else:
print('${installed_version}')
with open('/var/tmp/bunkerweb/database_uri', 'w') as file:
file.write(db.database_uri)
EOL
current_version=$(sudo -E -u nginx -g nginx /bin/bash -c "PYTHONPATH=$PYTHONPATH python3 /tmp/version_check.py")
rm -f /tmp/version_check.py
current_version=$(sudo -E -u nginx -g nginx /bin/bash -c "PYTHONPATH=$PYTHONPATH python3 /tmp/version_check.py")
rm -f /tmp/version_check.py
if [ "$current_version" == "none" ]; then
log "SYSTEMCTL" "❌" "Failed to retrieve database version"
exit 1
fi
if [ "$current_version" == "none" ]; then
log "SYSTEMCTL" "❌" "Failed to retrieve database version"
exit 1
fi
DATABASE_URI=$(cat /var/tmp/bunkerweb/database_uri)
export DATABASE_URI
rm -f /var/tmp/bunkerweb/database_uri
# Update configuration files
if sed -i "s|^sqlalchemy\\.url =.*$|sqlalchemy.url = $DATABASE_URI|" alembic.ini; then
if sed -i "s|^version_locations =.*$|version_locations = ${DATABASE}_versions|" alembic.ini; then
if [ "$current_version" != "$installed_version" ]; then
# Find the corresponding Alembic revision by scanning migration files
MIGRATION_DIR="/usr/share/bunkerweb/db/alembic/${DATABASE}_versions"

35
src/scheduler/entrypoint.sh
View file

@ -58,13 +58,10 @@ case "$db_type" in
;;
esac
# Update configuration files
if sed -i "s|^sqlalchemy\\.url =.*$|sqlalchemy.url = $DATABASE_URI|" alembic.ini; then
if sed -i "s|^version_locations =.*$|version_locations = ${DATABASE}_versions|" alembic.ini; then
# Check current version and stamp
log "ENTRYPOINT" "ℹ️" "Checking database version..."
installed_version=$(cat /usr/share/bunkerweb/VERSION)
current_version=$(python3 -c "
# Check current version and stamp
log "ENTRYPOINT" "ℹ️" "Checking database version..."
installed_version=$(cat /usr/share/bunkerweb/VERSION)
current_version=$(python3 -c "
import sqlalchemy as sa
from os import getenv
@ -73,8 +70,8 @@ from logger import setup_logger
LOGGER = setup_logger('Scheduler', getenv('CUSTOM_LOG_LEVEL', getenv('LOG_LEVEL', 'INFO')))
engine = Database(LOGGER).sql_engine
with engine.connect() as conn:
db = Database(LOGGER)
with db.sql_engine.connect() as conn:
try:
result = conn.execute(sa.text('SELECT version FROM bw_metadata WHERE id = 1'))
print(next(result)[0])
@ -83,13 +80,23 @@ with engine.connect() as conn:
print('none')
else:
print('${installed_version}')
")
if [ "$current_version" == "none" ]; then
log "ENTRYPOINT" "❌" "Failed to retrieve database version"
exit 1
fi
with open('/var/tmp/bunkerweb/database_uri', 'w') as file:
file.write(db.database_uri)
")
if [ "$current_version" == "none" ]; then
log "ENTRYPOINT" "❌" "Failed to retrieve database version"
exit 1
fi
DATABASE_URI=$(cat /var/tmp/bunkerweb/database_uri)
export DATABASE_URI
rm -f /var/tmp/bunkerweb/database_uri
# Update configuration files
if sed -i "s|^sqlalchemy\\.url =.*$|sqlalchemy.url = $DATABASE_URI|" alembic.ini; then
if sed -i "s|^version_locations =.*$|version_locations = ${DATABASE}_versions|" alembic.ini; then
if [ "$current_version" != "$installed_version" ]; then
# Find the corresponding Alembic revision by scanning migration files
MIGRATION_DIR="/usr/share/bunkerweb/db/alembic/${DATABASE}_versions"