Merge branch 'develop'

README.md

@@ -24,6 +24,7 @@ All these variables are initialized with default variables defined in :code:`.en
 - `DB_HOST`: defines the host of the Database. Only used if `DB_ENGINE=postgresql`.
 - `DB_PORT`: defines the port of the Database. Only used if `DB_ENGINE=postgresql`.
 - `NO_DEBUG`: defines wether or not the LOVE-.manager will be run using Django's debug mode. If the variable is defined, then Debug mode will be off.
+- `LOVE_PRODUCER_LEGACY`: defines wether or not ussing the legacy LOVE-producer version. If the variable is defined, then the CSC Client won't be used and the legacy version will.
 - `SECRET_KEY`: overrides Django's SECRET_KEY, if not defined the default value (public in this repo) will be used.
 - `AUTH_LDAP_SERVER_URI`: (deprecated) the location of the LDAP authentication server. No LDAP server is used if this variable is empty
 

manager/manager/settings.py

@@ -258,6 +258,6 @@
     TRACE_TIMESTAMPS = False
 
 
-# LOVE-CSC-PRODUCER
-"""Defines wether or not ussing the new LOVE-producer version, i.e. LOVE CSC Producer"""
-LOVE_CSC_PRODUCER = os.environ.get("LOVE_CSC_PRODUCER", False)
+# LOVE-PRODUCER-CONFIGURATION
+"""Defines wether or not ussing the legacy LOVE-producer version, i.e. not the LOVE CSC Producer"""
+LOVE_PRODUCER_LEGACY = os.environ.get("LOVE_PRODUCER_LEGACY", False)

manager/requirements.txt

@@ -86,7 +86,7 @@ sqlparse==0.3.1
 Twisted==20.3.0
 txaio==20.1.1
 uritemplate==3.0.1
-urllib3==1.25.8
+urllib3==1.26.5
 wcwidth==0.1.8
 zipp==3.1.0
 zope.interface==4.7.2

manager/subscription/consumers.py

@@ -328,7 +328,7 @@ async def _join_group(self, category, csc, salindex, stream):
 
         # If subscribing to an event, send the initial_state
         if category == "event":
-            csc_group_key = csc if settings.LOVE_CSC_PRODUCER else "all"
+            csc_group_key = csc if not settings.LOVE_PRODUCER_LEGACY else "all"
             await self.channel_layer.group_send(
                 f"initial_state-{csc_group_key}-all-all",
                 {