Template
Fix pg_dump backup auth and servers API bearer timeouts.
This commit is contained in:
@@ -24,6 +24,37 @@ def get_database_url() -> str:
|
||||
return os.environ.get('DATABASE_URL', DEFAULT_DATABASE_URL).strip()
|
||||
|
||||
|
||||
def get_pg_connection_params() -> dict[str, str]:
|
||||
"""Connection parameters for pg_dump/psql (same source as the app pool)."""
|
||||
from psycopg.conninfo import conninfo_to_dict
|
||||
|
||||
url = get_database_url()
|
||||
scheme, _, rest = url.partition('://')
|
||||
if scheme.startswith('postgresql'):
|
||||
url = f'postgresql://{rest}'
|
||||
|
||||
info = conninfo_to_dict(url)
|
||||
params = {
|
||||
'host': str(info.get('host') or 'localhost'),
|
||||
'port': str(info.get('port') or '5432'),
|
||||
'user': str(info.get('user') or 'amnezia'),
|
||||
'password': str(info.get('password') or ''),
|
||||
'dbname': str(info.get('dbname') or 'amnezia_panel'),
|
||||
}
|
||||
|
||||
# Prefer discrete env vars when set (Dokploy / compose); avoids URL encoding issues.
|
||||
if os.environ.get('POSTGRES_USER', '').strip():
|
||||
params['user'] = os.environ['POSTGRES_USER'].strip()
|
||||
if os.environ.get('POSTGRES_PASSWORD', '').strip():
|
||||
params['password'] = os.environ['POSTGRES_PASSWORD'].strip()
|
||||
if os.environ.get('POSTGRES_DB', '').strip():
|
||||
params['dbname'] = os.environ['POSTGRES_DB'].strip()
|
||||
if os.environ.get('POSTGRES_PORT', '').strip():
|
||||
params['port'] = os.environ['POSTGRES_PORT'].strip()
|
||||
|
||||
return params
|
||||
|
||||
|
||||
def get_pool():
|
||||
global _pool
|
||||
if _pool is not None:
|
||||
|
||||
Reference in New Issue
Block a user