Merge pull request #3927 from hove-io/add_application_name_in_db_connexion

application_name added in connect_args

Author: azime

source/jormungandr/jormungandr/default_settings.py

@@ -6,7 +6,9 @@
 from flask_restful.inputs import boolean
 
 # sql queries will return an exception if the query did not succeed before `statement_timeout`
-DEFAULT_SQLALCHEMY_ENGINE_OPTIONS = {"connect_args": {"options": "-c statement_timeout=1000"}}  # 1000ms
+DEFAULT_SQLALCHEMY_ENGINE_OPTIONS = {
+    "connect_args": {"options": "-c statement_timeout=1000", "application_name": "Jormungandr"}
+}  # 1000ms
 
 # path of the configuration file for each instances
 INSTANCES_DIR = os.getenv('JORMUNGANDR_INSTANCES_DIR', '/etc/jormungandr.d')

source/tyr/tyr/default_settings.py

@@ -2,6 +2,7 @@
 from datetime import timedelta
 from celery import schedules
 import os
+import json
 from flask_restful.inputs import boolean
 
 # URL for the brokker, by default it's the local rabbitmq
@@ -19,6 +20,11 @@
     'TYR_SQLALCHEMY_DATABASE_URI', 'postgresql://navitia:navitia@localhost/jormungandr'
 )
 
+DEFAULT_SQLALCHEMY_ENGINE_OPTIONS = {"connect_args": {"application_name": "Tyr"}}
+
+SQLALCHEMY_ENGINE_OPTIONS = (
+    json.loads(os.getenv('TYR_SQLALCHEMY_ENGINE_OPTIONS', '{}')) or DEFAULT_SQLALCHEMY_ENGINE_OPTIONS
+)
 
 # URI for cities database
 # postgresql://<user>:<password>@<host>:<port>/<dbname>