Skip to content

feat: add bouncer URL override, disable internal bouncer if using pgdog #1536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
beaugunderson wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: add bouncer URL override, disable internal bouncer if using pgdog #1536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98ed802
add bouncer URL override
beaugunderson Feb 9, 2026
1681dd7
disable internal pool if using pgdog
beaugunderson Feb 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions plugin_runner/installation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,12 @@ def open_database_connection() -> Connection:
When running within Aptible, use the database URL, otherwise pull from
the environment variables.
"""
if os.getenv("DATABASE_URL"):
parsed_url = parse.urlparse(os.getenv("DATABASE_URL"))
database_url = os.getenv("CANVAS_PLUGINS_BOUNCER_DATABASE_URL") or os.getenv("DATABASE_URL")
if database_url:
parsed_url = parse.urlparse(database_url)

return psycopg.connect(
dbname=cast(str, parsed_url.path[1:]),
dbname=parsed_url.path[1:],
user=cast(str, parsed_url.username),
password=cast(str, parsed_url.password),
host=cast(str, parsed_url.hostname),
Expand Down
16 changes: 12 additions & 4 deletions settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@
CANVAS_SDK_DB_PASSWORD = os.getenv("CANVAS_SDK_DB_PASSWORD", "app")
CANVAS_SDK_DB_HOST = os.getenv("CANVAS_SDK_DB_HOST", "home-app-db")
CANVAS_SDK_DB_PORT = os.getenv("CANVAS_SDK_DB_PORT", "5432")
CANVAS_SDK_DB_URL = os.getenv("DATABASE_URL")
CANVAS_SDK_DB_URL = os.getenv("CANVAS_PLUGINS_BOUNCER_DATABASE_URL") or os.getenv("DATABASE_URL")
USING_BOUNCER = bool(os.getenv("CANVAS_PLUGINS_BOUNCER_DATABASE_URL"))

if IS_TESTING:
CANVAS_SDK_DB_BACKEND = "sqlite3"
Expand All @@ -92,13 +93,20 @@
db_config: dict[str, Any] = {
"ENGINE": "django.db.backends.postgresql",
"CONN_HEALTH_CHECKS": CONN_HEALTH_CHECKS_ENABLED,
"OPTIONS": {
}

# When going through pgdog (bouncer), let it handle connection pooling.
# Keep connections persistent so threads reuse their connection to pgdog.
# Otherwise, use Django's built-in psycopg connection pool.
if USING_BOUNCER:
db_config["CONN_MAX_AGE"] = None
else:
db_config["OPTIONS"] = {
"pool": {
"min_size": 2,
"max_size": PLUGIN_RUNNER_DATABASE_POOL_MAX,
}
},
}
}

if CANVAS_SDK_DB_URL:
parsed_url = parse.urlparse(CANVAS_SDK_DB_URL)
Expand Down
Loading