Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
2 changes: 1 addition & 1 deletion augur/api/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ def get_server_cache(cache_manager) -> Cache:

logger = AugurLogger("server").get_logger()
url = get_database_string()
engine = create_database_engine(url, poolclass=StaticPool)
engine = create_database_engine(url, poolclass=StaticPool, connect_args={"application_name": f"augur v{augur_code_version}"})
db_session = DatabaseSession(logger, engine)
augur_config = AugurConfig(logger, db_session)

Expand Down
3 changes: 2 additions & 1 deletion augur/application/cli/db.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import json
import re
import stat as stat_module
from metadata import __version__

from augur.application.cli import (
test_connection,
Expand Down Expand Up @@ -511,7 +512,7 @@ def run_psql_command_in_database(target_type, target):
database_name = db_config["database_name"]

db_conn_string = f"postgresql+psycopg2://{db_config['user']}:{db_config['password']}@{db_config['host']}:{db_config['port']}/{db_config['database_name']}"
engine = s.create_engine(db_conn_string)
engine = s.create_engine(db_conn_string, connect_args={"application_name": f"augur v{__version__}"})

check_call(
[
Expand Down
6 changes: 4 additions & 2 deletions augur/application/db/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

from augur.application.db.engine import create_database_engine, get_database_string

from metadata import __version__

engine = None
Session = None

Expand All @@ -12,7 +14,7 @@ def get_engine():

if engine is None:
url = get_database_string()
engine = create_database_engine(url=url, poolclass=StaticPool)
engine = create_database_engine(url=url, poolclass=StaticPool, connect_args={"application_name": f"augur v{__version__}"})
Session = sessionmaker(bind=engine)

return engine
Expand Down Expand Up @@ -42,7 +44,7 @@ def get_session():
def temporary_database_engine():

url = get_database_string()
temporary_database_engine = create_database_engine(url=url, poolclass=StaticPool)
temporary_database_engine = create_database_engine(url=url, poolclass=StaticPool, connect_args={"application_name": f"augur v{__version__}"})

try:
yield temporary_database_engine
Expand Down
5 changes: 3 additions & 2 deletions conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from augur.application.db.session import DatabaseSession
from augur.application.config import AugurConfig
from augur.application.db.engine import get_database_string, create_database_engine, parse_database_string, execute_sql_file

from metadata import __version__

logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -104,7 +104,8 @@ def generate_db_from_template(template_name):
create_database(conn, cursor, test_db_name, template_name)

# create engine to connect to db
engine = create_database_engine(test_db_string, poolclass=StaticPool)
engine = create_database_engine(test_db_string, poolclass=StaticPool, connect_args={"application_name": f"augur v{__version__}"})


yield engine

Expand Down
Loading