Move worker defaults to the build config file

Avoid having to setup a working development environment in order
to build the documentation.

Signed-off-by: Roberto Rosario <[email protected]>

Author: Roberto Rosario

config.env

@@ -52,3 +52,16 @@ SYSTEM_DIR=system
 # Supervisord
 SUPERVISOR_CONFIGURATION_DIRECTORY=/etc/supervisor/conf.d/
 SUPERVISOR_CONFIGURATION_FILENAME=mayan-edms.conf
+# Workers
+MAYAN_WORKER_A_CONCURRENCY=0
+MAYAN_WORKER_A_MAX_MEMORY_PER_CHILD=300000
+MAYAN_WORKER_A_MAX_TASKS_PER_CHILD=100
+MAYAN_WORKER_B_CONCURRENCY=0
+MAYAN_WORKER_B_MAX_MEMORY_PER_CHILD=300000
+MAYAN_WORKER_B_MAX_TASKS_PER_CHILD=100
+MAYAN_WORKER_C_CONCURRENCY=0
+MAYAN_WORKER_C_MAX_MEMORY_PER_CHILD=300000
+MAYAN_WORKER_C_MAX_TASKS_PER_CHILD=100
+MAYAN_WORKER_D_CONCURRENCY=1
+MAYAN_WORKER_D_MAX_MEMORY_PER_CHILD=300000
+MAYAN_WORKER_D_MAX_TASKS_PER_CHILD=10

docs/conf.py

@@ -23,9 +23,6 @@
 from contrib.scripts.version import Version
 
 import mayan
-from mayan.apps.task_manager.workers import (
-    worker_a, worker_b, worker_c, worker_d
-)
 
 import callbacks
 import patches
@@ -306,22 +303,6 @@ def setup(app):
     environment_variables['MAYAN_SUPERVISOR_CONF'] = MAYAN_SUPERVISOR_CONF
     environment_variables['MAYAN_VERSION'] = mayan.__version__
 
-    for worker_name in ['worker_a', 'worker_b', 'worker_c', 'worker_d']:
-        worker = globals()[worker_name]
-
-        environment_variables[
-            'MAYAN_{}_CONCURRENCY'.format(worker_name.upper())
-        ] = str(getattr(worker, 'concurrency'))
-
-        environment_variables[
-            'MAYAN_{}_MAX_MEMORY_PER_CHILD'.format(worker_name.upper())
-        ] = str(getattr(worker, 'maximum_memory_per_child'))
-
-        environment_variables[
-            'MAYAN_{}_MAX_TASKS_PER_CHILD'.format(worker_name.upper())
-        ] = str(getattr(worker, 'maximum_tasks_per_child'))
-
-
     substitutions = utils.generate_substitutions(
         dictionary=environment_variables
     )

mayan/apps/task_manager/workers.py

@@ -1,18 +1,35 @@
+from mayan.settings.literals import (
+    MAYAN_WORKER_A_CONCURRENCY, MAYAN_WORKER_A_MAX_MEMORY_PER_CHILD,
+    MAYAN_WORKER_A_MAX_TASKS_PER_CHILD, MAYAN_WORKER_B_CONCURRENCY,
+    MAYAN_WORKER_B_MAX_MEMORY_PER_CHILD, MAYAN_WORKER_B_MAX_TASKS_PER_CHILD,
+    MAYAN_WORKER_C_CONCURRENCY, MAYAN_WORKER_C_MAX_MEMORY_PER_CHILD,
+    MAYAN_WORKER_C_MAX_TASKS_PER_CHILD, MAYAN_WORKER_D_CONCURRENCY,
+    MAYAN_WORKER_D_MAX_MEMORY_PER_CHILD, MAYAN_WORKER_D_MAX_TASKS_PER_CHILD
+)
+
 from .classes import Worker
 
 worker_a = Worker(
-    maximum_memory_per_child=300000, maximum_tasks_per_child=100,
+    concurrency=MAYAN_WORKER_A_CONCURRENCY,
+    maximum_memory_per_child=MAYAN_WORKER_A_MAX_MEMORY_PER_CHILD,
+    maximum_tasks_per_child=MAYAN_WORKER_A_MAX_TASKS_PER_CHILD,
     name='worker_a', nice_level=0
 )
 worker_b = Worker(
-    maximum_memory_per_child=300000, maximum_tasks_per_child=100,
+    concurrency=MAYAN_WORKER_B_CONCURRENCY,
+    maximum_memory_per_child=MAYAN_WORKER_B_MAX_MEMORY_PER_CHILD,
+    maximum_tasks_per_child=MAYAN_WORKER_B_MAX_TASKS_PER_CHILD,
     name='worker_b', nice_level=2
 )
 worker_c = Worker(
-    maximum_memory_per_child=300000, maximum_tasks_per_child=100,
+    concurrency=MAYAN_WORKER_C_CONCURRENCY,
+    maximum_memory_per_child=MAYAN_WORKER_C_MAX_MEMORY_PER_CHILD,
+    maximum_tasks_per_child=MAYAN_WORKER_C_MAX_TASKS_PER_CHILD,
     name='worker_c', nice_level=15
 )
 worker_d = Worker(
-    concurrency=1, maximum_memory_per_child=300000,
-    maximum_tasks_per_child=10, name='worker_d', nice_level=18
+    concurrency=MAYAN_WORKER_D_CONCURRENCY,
+    maximum_memory_per_child=MAYAN_WORKER_D_MAX_MEMORY_PER_CHILD,
+    maximum_tasks_per_child=MAYAN_WORKER_D_MAX_TASKS_PER_CHILD,
+    name='worker_d', nice_level=18
 )

mayan/settings/literals.py

@@ -44,3 +44,15 @@
 SYSTEM_DIR = 'system'
 SUPERVISOR_CONFIGURATION_DIRECTORY = '/etc/supervisor/conf.d/'
 SUPERVISOR_CONFIGURATION_FILENAME = 'mayan-edms.conf'
+MAYAN_WORKER_A_CONCURRENCY = 0
+MAYAN_WORKER_A_MAX_MEMORY_PER_CHILD = 300000
+MAYAN_WORKER_A_MAX_TASKS_PER_CHILD = 100
+MAYAN_WORKER_B_CONCURRENCY = 0
+MAYAN_WORKER_B_MAX_MEMORY_PER_CHILD = 300000
+MAYAN_WORKER_B_MAX_TASKS_PER_CHILD = 100
+MAYAN_WORKER_C_CONCURRENCY = 0
+MAYAN_WORKER_C_MAX_MEMORY_PER_CHILD = 300000
+MAYAN_WORKER_C_MAX_TASKS_PER_CHILD = 100
+MAYAN_WORKER_D_CONCURRENCY = 1
+MAYAN_WORKER_D_MAX_MEMORY_PER_CHILD = 300000
+MAYAN_WORKER_D_MAX_TASKS_PER_CHILD = 10