Bye Bye Celery (3 - from settings)

Etienne Pallier
1 parent e93000d5
Showing 1 changed file with 2 additions and 72 deletions Show diff stats
src/pyros/settings.py
@@ -16,19 +16,11 @@ https://docs.djangoproject.com/en/1.9/ref/settings/
 # FOR SIMULATOR (TODO: remove because not used)
 SIMULATOR = False
  
-# FOR SIMULATOR (and TESTS)
-CELERY_TEST = False
-
 # For majordome_test.py:
 # cd src/majordome/
 # ./majordome_test.py
 MAJORDOME_TEST = False
  
-# (EP) Remove this the day we succeed to use no more of Celery...
-# Set this to False if you want to run pyros without using Celery (and RabbitMQ)
-USE_CELERY = False
-#USE_CELERY = True
-
 # Set MYSQL to False if you want to use SQLITE
 # This line MUST NOT be changed at all except from changing True/False
 # (or install_requirements script will become invalid)
@@ -172,8 +164,8 @@ else:
         }
     }
  
-# CELERY_TEST==True ==> 'TEST' RUN MODE, use pyros_test database
-if CELERY_TEST:
+# SIMULATOR==True ==> 'TEST (simu)' RUN MODE, use pyros_test database
+if SIMULATOR:
     DATABASES = {
         'default': {
             'OPTIONS': mysql_options, 
@@ -236,7 +228,6 @@ USE_L10N = True
 # Necessary for ENV monitoring :
 USE_TZ = False
 #USE_TZ = True
-#if USE_CELERY: USE_TZ = True
  
 # To find the media files {{ MEDIA_URL }}
 MEDIA_URL = '/public/static/media/'
@@ -280,64 +271,3 @@ else:
  
 # from django.core.cache import cache
 # cache.clear()
-
-# CELERY CONFIG
-
-CELERY_RESULT_BACKEND = 'amqp'
-#CELERY_RESULT_BACKEND = 'rpc://'
-#CELERY_RESULT_BACKEND='djcelery.backends.database:DatabaseBackend',
-
-# (EP) TODO: This should also be added (according to https://simpleisbetterthancomplex.com/tutorial/2017/08/20/how-to-use-celery-with-django.html)
-#CELERY_BROKER_URL = 'amqp://localhost'
-#CELERY_BROKER_URL = 'amqp://guest:guest@localhost:5672/'
-#CELERY_BROKER_URL = 'django://'
-
-CELERY_ACCEPT_CONTENT = ['json']
-CELERY_TASK_SERIALIZER = 'json'
-CELERY_RESULT_SERIALIZER = 'json'
-
-# EP TODO: no more necessary, to be removed
-CELERY_IMPORTS = (
-    "alert_manager.tasks",
-    "analyzer.tasks",
-    "majordome.tasks",
-    "monitoring.tasks",
-    "observation_manager.tasks",
-    "scheduler.tasks",
-)
-    # "userSimulator.tasks",
-
-# This config allows only 1 process / queue. We replace it by the -c option at celery workers creation.
-# CELERYD_CONCURRENCY = 1
-
-''' Following config is needed for manual purge '''
-CELERY_ACKS_LATE = False
-CELERYD_PREFETCH_MULTIPLIER = 1
-
-CELERY_QUEUES = {
-    "alert_listener_q": {"exchange": "alert_listener_q", "routing_key": "alert_listener_q"},
-    "monitoring_q": {"exchange": "monitoring_q", "routing_key": "monitoring_q"},
-    "majordome_q": {"exchange": "majordome_q", "routing_key": "majordome_q"},
-    "analysis_q": {"exchange": "analysis_q", "routing_key": "analysis_q"},
-    "scheduling_q": {"exchange": "scheduling_q", "routing_key": "scheduling_q"},
-    "create_calibrations_q": {"exchange": "create_calibrations_q", "routing_key": "create_calibrations_q"},
-    "execute_plan_vis_q": {"exchange": "execute_plan_vis_q", "routing_key": "execute_plan_vis_q"},
-    "execute_plan_nir_q": {"exchange": "execute_plan_nir_q", "routing_key": "execute_plan_nir_q"},
-    "night_calibrations_q": {"exchange": "night_calibrations_q", "routing_key": "night_calibrations_q"},
-}
-
-CELERY_ROUTES = {
-    "alert_manager.tasks.AlertListener": {"queue": "alert_listener_q"},
-    "majordome.tasks.Majordome": {"queue": "majordome_q"},
-    "monitoring.tasks.Monitoring": {"queue": "monitoring_q"},
-    "analyzer.tasks.analysis": {"queue": "analysis_q"},
-    "observation_manager.tasks.execute_plan_vis": {"queue": "execute_plan_vis_q"},
-    "observation_manager.tasks.execute_plan_nir": {"queue": "execute_plan_nir_q"},
-    "observation_manager.tasks.create_calibrations": {"queue": "create_calibrations_q"},
-    "observation_manager.tasks.night_calibrations": {"queue": "night_calibrations_q"},
-    "scheduler.tasks.scheduling": {"queue": "scheduling_q"}
-}
-    # "userSimulator.tasks.simulator": {"queue": "simulator_q"},
-
-''' Removes pickle warning '''
-CELERY_ACCEPT_CONTENT = ['pickle', 'json', 'msgpack', 'yaml']