Merge branch 'dev' of https://gitlab.irap.omp.eu/epallier/pyros into dev

Alain Klotz
2 parents 9e84041a d6e916dc
Showing 3 changed files with 14 additions and 2 deletions Show diff stats
config/devices/device_FLI_Kepler4040_noshutter_generic.yml
install/requirements.txt
src/core/pyros_django/pyros/settings.py
@@ -24,6 +24,10 @@ DEVICE:
         support: "USB3"
         language: "FLIPro"
  
+    # (TODO) Each camera has an attached GPS
+    #ATTACHED_DEVICES:
+    #    - file: device_FLI_KITS_sn2x1.yml
+
     CAPABILITIES:
  
         - CAPABILITY:
@@ -6,7 +6,7 @@ django-admin-tools==0.9.1
 django-bootstrap3==21.1
 django-extensions==3.1.5
 # for Django Rest Framework (DRF)
-djangorestframework
+djangorestframework=3.14.0
 # for Choices
 django-model-utils==4.2.0
 django-suit==0.2.28
@@ -326,6 +326,14 @@ if MYSQL:
             'USER': SQL_USER,
             'PASSWORD': SQL_PWD,
             'PORT': MYSQL_PORT,
+            # By default, Django creates a new connexion for each request
+            # For optimization, it is better to have "persistent" connexions by setting this timeout to a value greater than zero
+            # (BUT : We had initially set this to zero to be sure that a child process had not the same connexion as its parent)
+            # - Not persistant
+            #CONN_MAX_AGE = 0
+            # - Always persistant
+            #CONN_MAX_AGE = None
+            'CONN_MAX_AGE': 500,
             ''' 
                 (See https://docs.djangoproject.com/fr/2.1/topics/testing/overview/#the-test-database)
                 Optional, but this allows to remember the default django test database name 
@@ -354,7 +362,7 @@ else:
             'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
         }
     }
-CONN_MAX_AGE = 0
+
 # New in Django 3.2 : we have to tell that we want auto field for id
 DEFAULT_AUTO_FIELD='django.db.models.AutoField' 
 # SIMULATOR==True ==> 'TEST (simu)' RUN MODE, use pyros_test database