diff --git a/augur/api/server.py b/augur/api/server.py index e66228c518..77eb83bd82 100644 --- a/augur/api/server.py +++ b/augur/api/server.py @@ -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} api"}) db_session = DatabaseSession(logger, engine) augur_config = AugurConfig(logger, db_session) diff --git a/augur/application/cli/db.py b/augur/application/cli/db.py index a989050518..16b142e78d 100644 --- a/augur/application/cli/db.py +++ b/augur/application/cli/db.py @@ -511,7 +511,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 cli"}) check_call( [ diff --git a/augur/application/db/__init__.py b/augur/application/db/__init__.py index f460bee363..fe9f0d1e01 100644 --- a/augur/application/db/__init__.py +++ b/augur/application/db/__init__.py @@ -12,7 +12,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"}) Session = sessionmaker(bind=engine) return engine @@ -42,7 +42,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__} temporary"}) try: yield temporary_database_engine diff --git a/conftest.py b/conftest.py index 218ba31950..b72b400021 100644 --- a/conftest.py +++ b/conftest.py @@ -14,7 +14,6 @@ from augur.application.config import AugurConfig from augur.application.db.engine import get_database_string, create_database_engine, parse_database_string, execute_sql_file - logger = logging.getLogger(__name__) default_repo_id = "25430" @@ -104,7 +103,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 tests"}) + yield engine