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

Alain Klotz
2 parents 7200894b f05b7a2d
Showing 21 changed files with 196 additions and 615 deletions Show diff stats
README.md
install/REQUIREMENTS.txt
install/REQUIREMENTS_WINDOWS.txt
pyros.py
src/alert_manager/tasks.py
src/alert_manager/tests.py
src/analyzer/tasks.py
src/common/models.py
src/dashboard/templates/dashboard/reload_weather.html
src/majordome/TaskManager.py
src/majordome/tasks.py
src/misc/static/js/plotter.js
src/misc/static/js/weather.js
src/monitoring/start_celery_worker.py
src/monitoring/stop_celery_worker.py
src/monitoring/tasks.py
src/observation_manager/tasks.py
src/pyros/__init__.py
src/pyros/celery.py
src/pyros/settings.py
@@ -67,13 +67,14 @@ This software has been tested and validated with the following configurations :
 --------------------------------------------------------------------------------------------
 ## LAST VERSION
-Date: 15/10/2018
+Date: 17/01/2019
-By: E. Pallier
+Author: E. Pallier
-VERSION: 20181015.0.011.2 (bugfix)
+VERSION: 20190117.0.000.0
-- Bugfix majordome_test.py
+Comment:
+	NO MORE CELERY (removed from everywhere)
 --------------------------------------------------------------------------------------------
 - TECHNICAL DOC: tinyurl/pyros-colibri
@@ -92,6 +93,9 @@ VERSION: 20181015.0.011.2 (bugfix)
 Full list of commits: https://gitlab.irap.omp.eu/epallier/pyros/commits/master
+**17/01/19 : Version 20190117.0.000.0 (EP)**
+- NO MORE CELERY (removed from everywhere)
+
 **10/10/18 : Version 2018.0.011 (E. Pallier)**
 - NEW versionning plan : YYYYMMDD.M.mmm.b
     - YYYYMMDD = Day (UTC)
-amqp==1.4.9
-amqplib==1.0.2
-anyjson==0.3.3
-billiard==3.3.0.23
-requests==2.18.4
-celery==3.1.25
-DateTime==4.2
-Django==2.0.5
-django-admin-tools==0.8.1
-django-bootstrap3==10.0.1
-django-celery==3.2.2
-django-debug-toolbar==1.9.1
-django-extensions==2.0.7
-django-suit==0.2.26
-django-test-without-migrations==0.6
-gunicorn==19.8.1
-iso8601==0.1.12
-jdcal==1.4
-kombu==3.0.37
-lxml==3.8.0
-mysqlclient==1.3.12
-#pluggy==0.6.0
-pluggy>=0.7
-py==1.5.3
-pytz==2018.4
-six==1.11.0
-sqlparse==0.2.4
-Twisted==18.4.0
-voevent-parse==1.0.2
-zope.interface==4.5.0
-flower==0.9.2
+amqp==1.4.9
+amqplib==1.0.2
+anyjson==0.3.3
+billiard==3.3.0.23
+requests==2.18.4
+DateTime==4.2
+Django==2.0.5
+django-admin-tools==0.8.1
+django-bootstrap3==10.0.1
+django-debug-toolbar==1.9.1
+django-extensions==2.0.7
+django-suit==0.2.26
+django-test-without-migrations==0.6
+gunicorn==19.8.1
+iso8601==0.1.12
+jdcal==1.4
+kombu==3.0.37
+lxml==3.8.0
+mysqlclient==1.3.12
+#pluggy==0.6.0
+pluggy>=0.7
+py==1.5.3
+pytz==2018.4
+six==1.11.0
+sqlparse==0.2.4
+Twisted==18.4.0
+voevent-parse==1.0.2
+zope.interface==4.5.0
+flower==0.9.2
-amqp==1.4.9
-amqplib==1.0.2
-anyjson==0.3.3
-billiard==3.3.0.23
-requests==2.18.4
-celery==3.1.25
-DateTime==4.2
-Django==2.0.5
-django-admin-tools==0.8.1
-django-bootstrap3==10.0.1
-django-celery==3.2.2
-django-debug-toolbar==1.9.1
-django-extensions==2.0.7
-django-suit==0.2.26
-django-test-without-migrations==0.6
-gunicorn==19.4.5
-iso8601==0.1.12
-jdcal==1.4
-kombu==3.0.37
-mysqlclient==1.3.12
-pluggy==0.6.0
-py==1.5.3
-pytz==2018.4
-six==1.11.0
-sqlparse==0.2.4
-Twisted==16.0.0
-zope.interface==4.5.0
+amqp==1.4.9
+amqplib==1.0.2
+anyjson==0.3.3
+billiard==3.3.0.23
+requests==2.18.4
+DateTime==4.2
+Django==2.0.5
+django-admin-tools==0.8.1
+django-bootstrap3==10.0.1
+django-debug-toolbar==1.9.1
+django-extensions==2.0.7
+django-suit==0.2.26
+django-test-without-migrations==0.6
+gunicorn==19.4.5
+iso8601==0.1.12
+jdcal==1.4
+kombu==3.0.37
+mysqlclient==1.3.12
+pluggy==0.6.0
+py==1.5.3
+pytz==2018.4
+six==1.11.0
+sqlparse==0.2.4
+Twisted==16.0.0
+zope.interface==4.5.0
@@ -9,10 +9,6 @@ import argparse
 import time
 import signal
-# For USE_CELERY global variable
-#from src.pyros import settings
-USE_CELERY = False
-#USE_CELERY = True
 DEBUG = True
 SIMULATOR_CONFIG_FILE = "conf.json" #default config file
@@ -54,28 +50,27 @@ class Utils:
             print("Current directory : " + str(os.getcwd()))
         return 0
-    def replacePatternInFile(self, pattern, replace, file_path):
+    def replacePatternInFile(self, pattern, replacement, file_path):
         #try:
         with fileinput.FileInput(file_path, inplace=True, backup='.bak') as file:
             for line in file:
-                print(line.replace(pattern, replace), end='')
+                print(line.replace(pattern, replacement), end='')
         '''
         except:
             return 1
         return 0
         '''
         # Now, check that replacement has been done or else ERROR !!!
-        #pattern = "CELERY_TEST = "+str(set_it)
         FOUND=False
         #with fileinput.FileInput(file_path) as file:
         with open(file_path) as file:
             for line in file:
-                #if replace in line:
-                if line.startswith(replace):
+                #if replacement in line:
+                if line.startswith(replacement):
                     FOUND = True
                     break
         #if FOUND: print("pattern "+pattern+" found in file "+file_path)
-        if not FOUND: raise(Exception("pattern "+replace+" not found in file "+file_path))
+        if not FOUND: raise(Exception("pattern "+replacement+" not found in file "+file_path))
     def printColor(self, color, message, file=sys.stdout, eol=os.linesep, forced=False):
@@ -113,7 +108,6 @@ class AManager(Utils):
     python_version = sys.version_info
     bin_dir = ""
-    celery = "celery"
     venv_pip = "pip"
     venv_bin = "python"
     wait = True
@@ -141,34 +135,29 @@ class AManager(Utils):
             self.bin_dir = "Scripts"
             self.bin_name = "python.exe"
             self.pip_name = "pip.exe"
-            self.celery = "celery.exe"
         else:
             self.bin_dir = "bin"
             self.bin_name = "python"
             self.pip_name = "pip"
-            self.celery = "celery"
         self.venv_pip = self.path_dir_file + os.sep + config["path"] + os.sep + config["env"] + os.sep + self.bin_dir + os.sep + self.pip_name
         self.venv_bin = self.path_dir_file + os.sep + config["path"] + os.sep + config["env"] + os.sep + self.bin_dir + os.sep + self.bin_name
-        self.venv_cel = self.path_dir_file + os.sep + config["path"] + os.sep + config["env"] + os.sep + self.bin_dir + os.sep + self.celery
     def help(self):
         print("This function must be implemented")
         raise(NotImplementedError("Function not implemented"))
-    def set_celery_test_and_simulator_modes_to(self, set_it:bool, simulator:bool=True):
+    def set_simulator_mode_to(self, set_it:bool):
         file_path = "pyros/settings.py"
         '''
-        self.replacePatternInFile("CELERY_TEST = False", "CELERY_TEST = True", file_path)
         if simulator: self.replacePatternInFile("SIMULATOR = False", "SIMULATOR = True", file_path)
         '''
-        self.replacePatternInFile("CELERY_TEST = "+str(not set_it), "CELERY_TEST = "+str(set_it), file_path)
-        if simulator: self.replacePatternInFile("SIMULATOR = "+str(not set_it), "SIMULATOR = "+str(set_it), file_path)
+        self.replacePatternInFile("SIMULATOR = "+str(not set_it), "SIMULATOR = "+str(set_it), file_path)
     def signal_handler(self, signal, frame):
         self.printFullTerm(Colors.WARNING, "Ctrl-c catched")
-        self.set_celery_test_and_simulator_modes_to(False)
+        self.set_simulator_mode_to(False)
         for p in self.subproc:
             proc, name = p
             self.printColor(Colors.BLUE, "Killing process " + str(name))
@@ -448,12 +437,10 @@ class Pyros(AManager):
         return self.execProcess("rm logs/*.log")
     def test(self):
-        ##self.singleWorker("scheduling")
         self.changeDirectory("src")
         ##self.execProcessFromVenv(self.venv_bin + " manage.py test")
         self.execProcessFromVenvAsync(self.venv_bin + " manage.py test")
         self.changeDirectory("..")
-        ##self.stop_workers()
         return 0
     def migrate(self):
@@ -487,7 +474,7 @@ class Pyros(AManager):
     def reset_config(self):
         self.changeDirectory("src")
-        self.set_celery_test_and_simulator_modes_to(False)
+        self.set_simulator_mode_to(False)
         self.addExecuted(self.current_command, "reset configuration")
         self.changeDirectory("..")
         return 0
@@ -514,50 +501,6 @@ class Pyros(AManager):
         return 0
-    def celery_on(self, TOTAL=True):
-        self.changeDirectory("src")
-
-        if TOTAL: self.execProcessFromVenvAsync(self.venv_cel + " worker -A pyros -Q alert_listener_q -n pyros@alert_listener -c 1")
-        if TOTAL: self.execProcessFromVenvAsync(self.venv_cel + " worker -A pyros -Q monitoring_q -n pyros@monitoring -c 1")
-
-        #self.singleWorker("majordome")
-        self.execProcessFromVenvAsync(self.venv_cel + " worker -A pyros -Q majordome_q -n pyros@majordome -c 1")
-
-        #self.singleWorker("scheduling")
-        self.execProcessFromVenvAsync(self.venv_cel + " worker -A pyros -Q scheduling_q --purge -n pyros@scheduling -c 1")
-        
-        #self.singleWorker("execute_plan_vis")
-        self.execProcessFromVenvAsync(self.venv_cel + " worker -A pyros -Q execute_plan_vis_q --purge -n pyros@execute_plan_vis -c 1")
-
-        if TOTAL: self.execProcessFromVenvAsync(self.venv_cel + " worker -A pyros -Q night_calibrations_q --purge -n pyros@night_calibrations -c 1")
-        
-        #self.singleWorker("execute_plan_nir")
-        self.execProcessFromVenvAsync(self.venv_cel + " worker -A pyros -Q execute_plan_nir_q --purge -n pyros@execute_plan_nir -c 1")
-        
-        #self.singleWorker("create_calibrations")
-        self.execProcessFromVenvAsync(self.venv_cel + " worker -A pyros -Q create_calibrations_q --purge -n pyros@create_calibrations -c 1")
-
-        #self.singleWorker("analysis")
-        self.execProcessFromVenvAsync(self.venv_cel + " worker -A pyros -Q analysis_q --purge -n pyros@analysis -c 1")
-        
-        self.changeDirectory("..")
-        return 0
-
-    # ex start()
-    def start_workers(self):
-        self.stop_workers()
-        self.celery_on()
-        return 0
-
-    # ex stop()
-    def stop_workers(self):
-        if (self.system == "Windows"):
-            self.execProcessAsync("taskkill /f /im celery.exe")
-            self.execProcessAsync("taskkill /f /im python.exe")
-        else:
-            self.execProcessAsync("ps aux | grep \"celery worker\" | awk '{print $2}' | xargs kill -9")
-        return 0
-
     def init_database(self):
         self.makemigrations()
         self.migrate()
@@ -596,15 +539,6 @@ class Pyros(AManager):
         what="all"
         '''
-        ''' OLD CODE
-        self.stop_workers()
-        #self.celery_on()
-        # Start the 3 main agents (via their celery worker) :
-        self.startAgent("monitoring")
-        self.startAgent("majordome")
-        self.startAgent("alert_listener")
-        '''
-
         # Go into src/
         self.changeDirectory("src")
         #print("Current directory : " + str(os.getcwd()))
@@ -655,17 +589,10 @@ class Pyros(AManager):
-    def startAgent(self, agent_name:str):
-        # Start Celery Worker
-        self.singleWorker(agent_name)
-        time.sleep(3)
-        # Put the agent task run() into the Worker queue
-
-        
     # Reset the database content
     def reset_database_sim(self):
         self.changeDirectory("src")
-        self.set_celery_test_and_simulator_modes_to(True, False)
+        self.set_simulator_mode_to(True, False)
         '''
         Supprime toutes les données de la base de données 
         et réexécute tout gestionnaire de post-synchronisation. 
@@ -673,11 +600,11 @@ class Pyros(AManager):
         '''
         #TODO: remplacer par manage.py --noinput flush pour eviter le "echo yes"...
         self.execProcess( self.venv_bin + " manage.py flush  --noinput")
-        self.set_celery_test_and_simulator_modes_to(True, False)
+        self.set_simulator_mode_to(True, False)
         self.changeDirectory("..")
-    # Simulation for the scheduler ONLY (and only some celery workers, not all of them)
+    # Simulation for the scheduler ONLY
     def simulator_development(self):
         self.simulator(False)
@@ -691,12 +618,11 @@ class Pyros(AManager):
     delete from request;
     '''
-    # Simulation (by default, with ALL simulators and ALL celery workers)
+    # Simulation (by default, with ALL simulators)
     def simulator(self, TOTAL=True):
         self.changeDirectory("src")
-        # Set CELERY_TEST mode ON
-        self.replacePatternInFile("CELERY_TEST = False", "CELERY_TEST = True", "pyros/settings.py")
+        # Set SIMULATOR mode ON
         self.replacePatternInFile("SIMULATOR = False", "SIMULATOR = True", "pyros/settings.py")
         # 0) Reset the database (Empty the database from any data)
@@ -714,7 +640,7 @@ class Pyros(AManager):
         self.loaddata()
         #
-        # 1) Launch Django web server
+        # 1) Launch web server
         #
         self.server()
         self.sleep(2)
@@ -727,18 +653,11 @@ class Pyros(AManager):
         self.printColor(Colors.GREEN, "If you want to shutdown the simulation, please run :")
         self.printColor(Colors.GREEN, "CTRL-C or pyros.py kill_simulation")
         self.printColor(Colors.GREEN, "If the simulation isn't correctly killed, please switch the variable")
-        self.printColor(Colors.GREEN, "CELERY_TEST in src/pyros/settings.py to False")
+        self.printColor(Colors.GREEN, "SIMULATOR in src/pyros/settings.py to False")
         self.printFullTerm(Colors.WARNING, "SUMMARY")
         #
-        # 2) (if USE_CELERY) Start Celery workers
-        #
-        if USE_CELERY:
-            self.celery_on(TOTAL)
-            self.sleep(3)
-
-        #
-        # 3) Start simulator(s) :
+        # 2) Start simulator(s) :
         #
         self.sims_launch(TOTAL)
@@ -774,20 +693,6 @@ class Pyros(AManager):
             self.changeDirectory("..")
         '''
-        '''
-        #
-        # 2) (if not USE_CELERY) Start Agents
-        #
-        if TOTAL and not USE_CELERY :
-            #pass
-            # Start Environment Monitoring Agent
-            # Start Majordome Agent
-            # Start Alert Manager Agent
-            self.start_agents()
-            # Needed ?
-            self.sleep(3)
-        '''
-
         # When simulators are finished:
         #self.kill_simulation()
         return 0
@@ -799,8 +704,8 @@ class Pyros(AManager):
     def test_majordome(self):
         self.changeDirectory("src")
-        # Set CELERY_TEST mode ON
-        self.set_celery_test_and_simulator_modes_to(True)
+        # Set SIMULATOR mode ON
+        self.set_simulator_mode_to(True)
         # 0) Reset the database (Empty the database from any data)
         self.changeDirectory("..")
@@ -824,19 +729,11 @@ class Pyros(AManager):
         self.printColor(Colors.GREEN, "If you want to shutdown the simulation, please run :")
         self.printColor(Colors.GREEN, "CTRL-C or pyros.py kill_simulation")
         self.printColor(Colors.GREEN, "If the simulation isn't correctly killed, please switch the variable")
-        self.printColor(Colors.GREEN, "CELERY_TEST in src/pyros/settings.py to False")
+        self.printColor(Colors.GREEN, "SIMULATOR in src/pyros/settings.py to False")
         self.printFullTerm(Colors.WARNING, "SUMMARY")
-        # 2) (if USE_CELERY) Start Celery workers
         #
-        '''
-        if USE_CELERY:
-            self.celery_on(TOTAL)
-            self.sleep(3)
-        '''
-
-        #
-        # 3) Start simulator(s) :
+        # 2) Start simulator(s) :
         #
         #self.sims_launch(True)
         agent='majordome'
@@ -852,7 +749,7 @@ class Pyros(AManager):
         # When simulators are finished:
         #self.kill_simulation()
         #self.changeDirectory("src")
-        self.set_celery_test_and_simulator_modes_to(False)
+        self.set_simulator_mode_to(False)
         self.changeDirectory("..")
         self.execProcessAsync("ps aux | grep \"start_agent_majordome.py\" | awk '{ print $2 }' | xargs kill")
@@ -870,7 +767,7 @@ class Pyros(AManager):
     def kill_simulation(self):
         self.changeDirectory("src")
-        self.set_celery_test_and_simulator_modes_to(False)
+        self.set_simulator_mode_to(False)
         self.changeDirectory("..")
         if (self.system == "Windows"):
             self.execProcessAsync("taskkill /f /im python.exe")
@@ -884,12 +781,12 @@ class Pyros(AManager):
         self.kill_server()
-        # (if not using celery) Kill all agents :
-        if not USE_CELERY:
-            self.execProcessAsync("ps aux | grep \"start_agent_alert_manager.py\" | awk '{ print $2 }' | xargs kill")
-            self.execProcessAsync("ps aux | grep \"start_agent_monitoring.py\" | awk '{ print $2 }' | xargs kill")
-            self.execProcessAsync("ps aux | grep \"start_agent_majordome.py\" | awk '{ print $2 }' | xargs kill")
+        # Kill all agents :
+        self.execProcessAsync("ps aux | grep \"start_agent_alert_manager.py\" | awk '{ print $2 }' | xargs kill")
+        self.execProcessAsync("ps aux | grep \"start_agent_monitoring.py\" | awk '{ print $2 }' | xargs kill")
+        self.execProcessAsync("ps aux | grep \"start_agent_majordome.py\" | awk '{ print $2 }' | xargs kill")
         #self.execProcessAsync("ps aux | grep \"start_agent_majordome.py\" | awk '{ print $2 }' | xargs kill")
+
         # Kill all simulators :
         self.execProcessAsync("ps aux | grep \" domeSimulator.py\" | awk '{ print $2 }' | xargs kill")
         self.execProcessAsync("ps aux | grep \" userSimulator.py\" | awk '{ print $2 }' | xargs kill")
@@ -899,7 +796,6 @@ class Pyros(AManager):
         self.execProcessAsync("ps aux | grep \" cameraNIRSimulator.py\" | awk '{ print $2 }' | xargs kill")
         self.execProcessAsync("ps aux | grep \" cameraVISSimulator.py\" | awk '{ print $2 }' | xargs kill")
         self.changeDirectory("..")
-        if USE_CELERY: self.stop_workers()
         self.printFullTerm(Colors.GREEN, "simulation ended")
         return 0
@@ -1001,8 +897,8 @@ class Pyros(AManager):
         # Get back to project root folder
         self.changeDirectory("..")
-        # (if not celery) Launch agents (env monitor, major, alert mgr)
-        if not USE_CELERY: self.start_agents()
+        # Launch agents (env monitor, major, alert mgr)
+        self.start_agents()
         # Wait for end of simulators :
         for p in procs: p.wait()
@@ -1012,12 +908,6 @@ class Pyros(AManager):
         return 0
-    def singleWorker(self, worker):
-        self.changeDirectory("src")
-        self.execProcessFromVenvAsync(self.venv_cel + " worker -A pyros -Q "+ worker +"_q -n pyros@"+worker+" -c 1")
-        self.changeDirectory("..")
-        return 0
-
     def mysql_on(self):
         self.changeDirectory("src")
         self.replacePatternInFile("MYSQL = False", "MYSQL = True", "pyros/settings.py")
@@ -1050,7 +940,6 @@ class Pyros(AManager):
             "unittest": self.unittest,
             "reset_config": self.reset_config,
             "test_all": self.test_all,
-            "celery_on": self.celery_on,
             "reset_database_sim": self.reset_database_sim,
             "init_database": self.init_database,
             "kill_server": self.kill_server,
@@ -1065,10 +954,6 @@ class Pyros(AManager):
             "start_agent_alertmanager": self.start_agent_alertmanager,
             "test_majordome": self.test_majordome,
-            # ex start
-            "start_workers": self.start_workers,
-            # ex stop
-            "stop_workers": self.stop_workers,
             "simulator": self.simulator,
             "kill_simulation": self.kill_simulation,
             "sims_launch": self.sims_launch,
@@ -1092,14 +977,11 @@ class Pyros(AManager):
             "updatedb": "Update the database",
             "kill_server": "Kill the web server on port 8000",
             "init_database": "Create a standard context for pyros in db",
-            "unittest": "Runs the tests that don't need celery",
+            "unittest": "Runs the unit tests",
             "test_all": "Run all the existing tests (this command needs to be updated when tests are added in the project",
-            "celery_on": "Starts celery workers",
-            "start_workers": "Starts the celery workers (then the web server ???)",
-            "stop_workers": "Stops the celery workers",
             "simulator": "Launch a simulation",
             "simulator_development": "Simulation for the scheduler only",
-            "kill_simulation": "kill the simulators / celery workers / web server",
+            "kill_simulation": "kill the simulators & web server",
             "sims_launch": "Launch only the simulators",
         }
 from __future__ import absolute_import
-from celery.task import Task
 from alert_manager.StrategyBuilder import StrategyBuilder
 from common.models import *
 from django.conf import settings
@@ -23,7 +22,7 @@ DEBUG_FILE = False
 '''
-class AlertListener(Task):
+class AlertListener():
     old_files = []
     # TODO check monitoring and majordome status ?
@@ -78,51 +78,3 @@ class TestStrategyChange(TestCase):
         new_alert = Alert.objects.exclude(id=self.alert.id)[0]
         self.assertEqual(new_alert.strategyobs.id, self.strat2.id, "The new alert should have the 'strat2' strategy")
-# OBSOLETE
-# class AlertListenerTestsCelery(TestCase):
-#     '''
-#         IMPORTANT : As soon as you do a DB request in a test, the test DB will no longer be synchronized with the DB used by celery
-#                     I have no idea why (Paul), but any call to the DB must be done in setup or after all celery actions are finished
-#     '''
-#
-#     def test_alert_reception(self):
-#         '''
-#             Must be launched with scripts/celery_test.sh
-#             Copy a VOEvent file in the events_received directory to start the workflow
-#             Tests if the alert and children are well created
-#         '''
-#
-#
-#         if os.path.isfile(TEST_FILE_PATH):
-#             os.remove(TEST_FILE_PATH)
-#             print("================== DELETE FILE ==================")
-#             time.sleep(3)
-#
-#         print("================== COPY FILE ==================")
-#         shutil.copyfile(os.path.join(VOEVENTS_TO_SEND_PATH, TEST_FILE),
-#                         TEST_FILE_PATH)
-#         time.sleep(4)
-#
-#         self.assertEqual(Alert.objects.count(), 1)
-#         alert = Alert.objects.all()[0]
-#         self.assertEqual(alert.author, "ivo://nasa.gsfc.tan/gcn")
-#         self.assertEqual(alert.burst_ra, 74.7412)
-#         self.assertEqual(alert.burst_dec, 25.3137)
-#         self.assertEqual(alert.trig_id, 532871)
-#         self.assertEqual(alert.editor, "61")
-#         self.assertEqual(alert.pkt_ser_num, 1)
-# 
-#         self.assertEqual(Request.objects.count(), 1)
-#         self.assertEqual(Sequence.objects.count(), 2)
-#         self.assertEqual(Album.objects.count(), 3)
-#         self.assertEqual(Plan.objects.count(), 6)
-#
-#
-#
-#     def test_basic(self):
-#         '''
-#             Used to test scripts/celery_test.sh
-#             Only work if the initial_fixture is on the celery test DB (an only it)
-#         '''
-#         Country.objects.create(name="TEEEEST")
-#         self.assertEqual(Country.objects.count(), 2, "should be 2 countries")
 from __future__ import absolute_import
-from celery.task import Task
 from common.models import *
 from utils.Logger import setupLogger
 from django.conf import settings
@@ -12,7 +11,8 @@ import os
 '''
-class Analysis(Task):
+#class Analysis(Task):
+class Analysis():
     logger = setupLogger("analysis", "analysis")
     def log(self, message: str) -> int:
@@ -661,6 +661,7 @@ class StrategyObs(models.Model):
         return (str(self.name))
+#TODO: à virer car utilisé pour Celery (ou bien à utiliser pour les agents)
 class TaskId(models.Model):
     task = models.CharField(max_length=45, blank=True, null=True)
     created = models.DateTimeField(blank=True, null=True, auto_now_add=True)
@@ -33,17 +33,26 @@
     padding: 3px 5px 3px 3px;
     margin: 1px 2px 1px 1px;
 }
+	div.box {
+    /*float:left;*/
+    /*display:inline;*/
+    font-size: 11pt;
+    /*background:#e7e4e4;*/
+    border: 1px solid rgba(0, 0, 0, 0.125);
+    border-color: #2FA4E7;
+    border-radius: 0.25rem;
+    padding: 3px 5px 3px 3px;
+    margin: 1px 2px 1px 1px;
+}
 </style>
 {%  endblock %}
 {% block content %}
 <div id="page-wrapper" class="row">
-	<h1 id="none">Weather info</h1>
-	Maximum of weather info iteration set: {{iteration}} Config 10190108
-	<div class="row">
-		<div id="global" class="container-fluid hbox">
-		<h4>Global</h4>
+	<div class="row col-md-3">
+        <h3>Weather info</h3>
+		<div id="global" class="container-fluid box">
 		<table>
 			<tr class="alert alert-danger">
 				<th scope="row">global_status:&nbsp;</th><td id="global_status">KO</td>
@@ -62,14 +71,17 @@
 			</tr>
 		</table>
 		</div>
-		<div id="plc" class="container-fluid hbox">
+		<div id="plc" class="container-fluid box">
 		</div>
 	</div>
-	<div class="container-fluid row">
+	<div class="row col-md-8">
 		<h3>Weather history </h3>
-		<div id="refresh" class="container-fluid well">
-			<div id="humidity_plot"></div>
-		</div>
+        <div id="humidity_plot" class="container-fluid hbox"></div>
+        <div id="pressure_plot" class="container-fluid hbox"></div>
+        <div id="rain_plot" class="container-fluid hbox"></div>
+        <div id="temperature_plot" class="container-fluid hbox"></div>
+        <div id="wind_plot" class="container-fluid hbox"></div>
+        <div id="wind_dir_plot" class="container-fluid hbox"></div>
     </div>
 </div>
 {% endblock %}
 from common.models import *
-from celery.task.control import revoke
 import time
 from devices import Telescope, CameraVIS, CameraNIR
@@ -11,13 +10,14 @@ def delete_pending_tasks(task_names, terminate=False):
         :param task_names: array of tasks names to delete 
     '''
-    # TODO : il faudra aller plus loin, et dire aux instruments de s'arrêter
+    #TODO : il faudra aller plus loin, et dire aux instruments de s'arrêter
     for task_name in task_names:
         tasks = TaskId.objects.filter(task=task_name)
         for task in tasks:
             print("je revoke : ", task.task_id)
-            revoke(task.task_id, terminate=terminate)
+            #TODO:
+            ###revoke(task.task_id, terminate=terminate)
             task.delete()
         """ The sleep is in case of sequence stopping :
@@ -3,7 +3,6 @@ from __future__ import absolute_import
 import time
 import datetime
-from celery.task import Task
 #from django.core.exceptions import ObjectDoesNotExist
 #from django.db.models import Q
 from django.shortcuts import get_object_or_404
@@ -48,7 +47,7 @@ log = L.setupLogger(&quot;MajordomeTaskLogger&quot;, &quot;Majordome&quot;)
 '''
-class Majordome(Task):
+class Majordome():
 # (EP) do this so that Majordome can be run from a thread, and called with thread.start():
 #class Majordome(Task, Thread):
@@ -84,7 +83,6 @@ class Majordome(Task):
     '''
-        OLD //// Function called by celery task
         Behavior:
             Init telescope / cameras
             set night limits
@@ -575,7 +573,7 @@ class Majordome(Task):
         Function called by the main loop to handle the task event (check monitoring and alert_manager)
     '''
     def handleTasks(self):
-        if not settings.USE_CELERY: return 0
+        return 0
         self.timers["tasks"] = self.tasks_timer
         if self.monitoring_task is None:
@@ -623,7 +621,7 @@ class Majordome(Task):
                     if (settings.DEBUG and DEBUG_FILE):
                         log.info("Timer : " + str(timer_name) + " executed")
             # EP added because loop is too quick (without CELERY)
-            if not settings.USE_CELERY: time.sleep(2)
+            time.sleep(2)
         return (0)
     '''
@@ -709,12 +707,8 @@ class Majordome(Task):
         self.timers["night_end"] = getNightEnd()
         if (self.isValidStatus(self.status_tel)):
             #observation_manager.tasks.night_calibrations.apply_async()
-            if settings.USE_CELERY:
-                print("MJ: call observation_manager WITH CELERY")
-                observation_manager.tasks.night_calibrations.apply_async()
-            else:
-                print("MJ: call observation_manager WITHOUT CELERY")
-                observation_manager.tasks.night_calibrations().run()
+            print("MJ: call observation_manager WITHOUT CELERY")
+            observation_manager.tasks.night_calibrations().run()
         else:
             self.notifyTelescopeStatus("night_end")
@@ -730,12 +724,8 @@ class Majordome(Task):
             self.vis_camera.open_shutter()
             self.nir_camera.open_shutter()
         #scheduler.tasks.scheduling.apply_async((False, False))
-        if settings.USE_CELERY:
-            print("MJ: call schedule WITH CELERY")
-            scheduler.tasks.scheduling.apply_async((False, False))
-        else:
-            print("MJ: call schedule WITHOUT CELERY")
-            scheduler.tasks.scheduling().run((False, False))
+        print("MJ: call schedule WITHOUT CELERY")
+        scheduler.tasks.scheduling().run((False, False))
         return (0)
@@ -805,21 +795,13 @@ class Majordome(Task):
         if type == "WEATHER":
             self.dom.open()
             #scheduler.tasks.scheduling.delay((False, False))
-            if settings.USE_CELERY:
-                print("MJ: call schedule WITH CELERY")
-                scheduler.tasks.scheduling.delay((False, False))
-            else:
-                print("MJ: call schedule WITHOUT CELERY")
-                scheduler.tasks.scheduling().run((False, False))
+            print("MJ: call schedule WITHOUT CELERY")
+            scheduler.tasks.scheduling().run((False, False))
         elif type == "INSIDE":
             #scheduler.tasks.scheduling.delay((False, False))
-            if settings.USE_CELERY:
-                print("MJ: call schedule WITH CELERY")
-                scheduler.tasks.scheduling.delay((False, False))
-            else:
-                print("MJ: call schedule WITHOUT CELERY")
-                scheduler.tasks.scheduling().run((False, False))
+            print("MJ: call schedule WITHOUT CELERY")
+            scheduler.tasks.scheduling().run((False, False))
     '''
         Handle a new alarm (called by isInsideOk or isWeatherOk)
@@ -915,14 +897,9 @@ class Majordome(Task):
             if (self.isValidStatus(self.status_nir)):
                 for plan in sequence.albums.get(detector__name="Cagire").plans.all():
                     #res = observation_manager.tasks.execute_plan_nir.apply_async((plan.id, float(self.getCountdown(shs))))
-                    if settings.USE_CELERY:
-                        print("MJ: call observation_manager WITH CELERY")
-                        res = observation_manager.tasks.execute_plan_nir.apply_async(
-                            (plan.id, float(self.getCountdown(shs))))
-                    else:
-                        print("MJ: call observation_manager WITHOUT CELERY")
-                        res = observation_manager.tasks.execute_plan_nir().run(
-                            (plan.id, float(self.getCountdown(shs))))
+                    print("MJ: call observation_manager WITHOUT CELERY")
+                    res = observation_manager.tasks.execute_plan_nir().run(
+                        (plan.id, float(self.getCountdown(shs))))
                     # JB TODO : is it still usefull ?
                     # TaskId.objects.create(task_id=res.id, task="execute_plan")
@@ -938,12 +915,8 @@ class Majordome(Task):
             if (self.isValidStatus(self.status_vis)):
                 for plan in sequence.albums.get(detector__name="Visible camera").plans.all():
                     #res = observation_manager.tasks.execute_plan_vis.apply_async((plan.id, float(self.getCountdown(shs))))
-                    if settings.USE_CELERY:
-                        print("MJ: call observation_manager WITH CELERY")
-                        res = observation_manager.tasks.execute_plan_vis.apply_async((plan.id, float(self.getCountdown(shs))))
-                    else:
-                        print("MJ: call observation_manager WITHOUT CELERY")
-                        res = observation_manager.tasks.execute_plan_vis().run((plan.id, float(self.getCountdown(shs))))
+                    print("MJ: call observation_manager WITHOUT CELERY")
+                    res = observation_manager.tasks.execute_plan_vis().run((plan.id, float(self.getCountdown(shs))))
                     plans_results.append(res)
             else:
@@ -1027,12 +1000,8 @@ class Majordome(Task):
         self.logDB("System in pause for " + str(duration))
         time.sleep(duration)
         #scheduler.tasks.scheduling.apply_async(first_schedule=False, alert=False)
-        if settings.USE_CELERY:
-            print("MJ: call schedule WITH CELERY")
-            scheduler.tasks.scheduling.apply_async(first_schedule=False, alert=False)
-        else:
-            print("MJ: call schedule WITHOUT CELERY")
-            scheduler.tasks.scheduling().run(first_schedule=False, alert=False)
+        print("MJ: call schedule WITHOUT CELERY")
+        scheduler.tasks.scheduling().run(first_schedule=False, alert=False)
         self.setTime()
         print("system has been paused. Cause : " + cause)
@@ -28,13 +28,23 @@ function PlotterClas(hkname, plotdiv, HKRange) {
     this.layout = {
         title: 'Title of the Graph',
-        xaxis: {
-            title: 'Time'
+        //xaxis: {
+        //    title: 'Time'
+        //},
+        //yaxis: {
+        //    title: 'Value',
+        //    type: 'log'
+        //},
+        width: 400,
+        height: 200,
+        margin: {
+            l: 20,
+            r: 10,
+            b: 50,
+            t: 50,
+            pad: 4
         },
-        yaxis: {
-            title: 'Value',
-            type: 'log'
-        }
+        paper_bgcolor: '#f4f4f8'
     };
     this.layout.title = this.hkname;
     this.HKQueue.x = [];
+/*
+[data_[0].fields :
+cloud: null
+global_status: "OK"
+humidity: 0
+pressure: null
+rain: 0
+temperature: 7
+updated: "2019-01-09T09:44:04.702"
+wind: 1.44
+wind_dir: "193.00"
+*/
+
+
 var sync_plots = {
-    humidity_plot : new PlotterClas("wind", "humidity_plot", [0,30]),
+    humidity_plot : new PlotterClas("humidity", "humidity_plot", [0,80]),
+    pressure_plot : new PlotterClas("pressure", "pressure_plot", []),
+    rain_plot : new PlotterClas("rain", "rain_plot", []),
+    temperature_plot : new PlotterClas("temperature", "temperature_plot", []),
+    wind_plot : new PlotterClas("wind", "wind_plot", [0,80]),
+    wind_dir_plot : new PlotterClas("wind_dir", "wind_dir_plot", []),
 }
 var sync_weather = {
@@ -14,7 +33,12 @@ var sync_weather = {
             document.getElementById('global').innerHTML = res;
             //var res = sync_weather.object_to_tree(data_, ' ');
             //document.getElementById('refresh').innerHTML = res;
-            sync_plots.humidity_plot.refresh_list([data_[0].fields.updated , data_[0].fields.wind]);
+            sync_plots.humidity_plot.refresh_list([data_[0].fields.updated , data_[0].fields.humidity]);
+            sync_plots.pressure_plot.refresh_list([data_[0].fields.updated , data_[0].fields.pressure]);
+            sync_plots.rain_plot.refresh_list([data_[0].fields.updated , data_[0].fields.rain]);
+            sync_plots.temperature_plot.refresh_list([data_[0].fields.updated , data_[0].fields.temperature]);
+            sync_plots.wind_plot.refresh_list([data_[0].fields.updated , data_[0].fields.wind]);
+            sync_plots.wind_dir_plot.refresh_list([data_[0].fields.updated , data_[0].fields.wind_dir]);
         //}
     },
     tuned_state: function(data) {
@@ -1,46 +0,0 @@
-#!/usr/bin/env python3
-
-import os
-import platform
-import subprocess
-from sys import stderr, exit
-
-
-def ctrl_c_catch(proc):
-    print("Ctrl-c caught")
-    print("\nKilling process...")
-    proc.kill()
-    print("Exiting...")
-    exit(0)
-
-def main():
-    if platform.system() == 'Darwin':
-        p = os.system("brew services list | grep \"rabbitmq started\"")
-        if (p != 0):
-            print("RabbitMQ is not started", file=stderr)
-            return False
-        else: print("RabbitMQ started: OK")
-    elif platform.system() == "Linux":
-        output = subprocess.getoutput("ps -A")
-        if "rabbitmq-server" in output:
-            print("RabbitMQ started: OK")
-        else:
-            print("RabbitMQ is not started", file=stderr)
-            return False
-
-
-    os.chdir('..')
-
-    try:
-        process = subprocess.Popen("celery -A pyros worker -Q monitoring_q -n pyros@monitoring -c 1", shell=True)
-        process.wait()
-        print("Celery worker stopped")
-        exit(0)
-    except KeyboardInterrupt:
-        ctrl_c_catch(process)
-
-
-
-    return True
-if __name__ == '__main__':
-    main()
@@ -1,49 +0,0 @@
-#!/usr/bin/env python3
-
-
-# OLD BASH SCRIPT
-# ---------------
-
-# (1) Empty only monitoring queue:
-#celery -A pyros amqp queue.purge monitoring_q
-
-# (2) Empty ALL queues
-#celery -A pyros purge -f
-
-# (3) THE HARD WAY : something like that...
-#ps aux | grep \"celery worker\" | awk '{print $2}' | xargs kill -9
-
-
-
-# NEW PYTHON SCRIPT
-# -----------------
-
-import subprocess
-import sys
-import platform
-
-def main():
-    # if len(sys.argv) > 1:
-    #
-    #     if sys.argv[1] == "--help":
-    #         print("stop_celery_worker.py <arg>\n\t--all: purge all queue\n\t--hard: kill all celery worker "
-    #               "\n\t--soft or no arg: purge monitoring queue (this is the standard way)\n\t--help:display this help")
-    #         return True
-    #     elif sys.argv[1] == "--all":
-    #         p = subprocess.Popen("celery -A pyros purge -f", shell=True)
-    #     elif sys.argv[1] == "--hard":
-    if platform.system() == 'Windows':
-        p = subprocess.Popen("taskkill /f /im celery.exe", shell=True)
-    else:
-        p = subprocess.Popen("ps aux | grep \"monitoring_q\" | awk '{print $2}' | xargs kill -9", shell=True)
-    # else:
-    #     p = subprocess.Popen("celery -A pyros amqp queue.purge monitoring_q", shell=True)
-    p.wait()
-    # if (p.returncode != 0):
-    #     print("ERROR !: Worker's launch failed\r\n", file=sys.stderr)
-    #     return False
-    print("Workers stopped: OK")
-    return True
-
-if __name__ == '__main__':
-    main()
@@ -2,20 +2,13 @@ from __future__ import absolute_import
 from django.conf import settings
 from common.models import *
-# (EP) OLD task base class
-from celery.task import Task
-# NEW task base class, but DOES NOT WORK (because celery3 and not 4 ?) !!!
-#from celery import Task
-
 from src.monitoring.plc_checker import PlcChecker
 from devices.PLC import PLCController
 from utils.JDManipulator import *
 import json
 import utils.Logger as L
 import majordome.tasks
-from celery import app, task
 import alert_manager.tasks
-from celery import shared_task
 log = L.setupLogger("MonitoringTaskLogger", "Monitoring")
 # EP
@@ -29,7 +22,7 @@ DEBUG_FILE = True
 '''
-class Monitoring(Task):
+class Monitoring():
     timers = {}
     functions = {}
@@ -120,31 +113,14 @@ class Monitoring(Task):
                 #self.monitoring_task = TaskId.objects.get(task="majordome")
                 self.majordome_task = TaskId.objects.get(task="majordome")
             except Exception as e:
-                if settings.USE_CELERY:
-                    try:
-                        # Mind this will raise an Exception if RABBITMQ is not started !
-                        majordome.tasks.Majordome.apply_async()
-                        if settings.DEBUG and DEBUG_FILE:
-                            log.info(str(e))
-                    except Exception as e2:
-                        print("YOU MUST START RABBITMQ before running PyROS !")
-                        exit()
-                else: print("USE_CELERY is false => do not create Majordome task")
+                print("no USE_CELERY => do not create Majordome task")
         if self.alert_task is None:
             try:
                 self.alert_task = TaskId.objects.get(task="alert_manager")
             except Exception as e:
                 # Mind this will raise an Exception if RABBITMQ is not started !
-                if settings.USE_CELERY:
-                    try:
-                        alert_manager.tasks.AlertListener.apply_async()
-                        if settings.DEBUG and DEBUG_FILE:
-                            log.info(str(e))
-                    except Exception as e2:
-                        print("YOU MUST START RABBITMQ before running PyROS !")
-                        exit()
-                else: print("USE_CELERY is false => do not create AlertListener task")
+                print("no USE_CELERY => do not create AlertListener task")
         # EP non car 0 = false
         #return 0
         return True
 from __future__ import absolute_import
-from celery.task import Task
 from django.conf import settings
 from common.models import *
 from utils.Logger import setupLogger
@@ -15,7 +14,8 @@ import os
 '''
     Super class for execute_plan_vis / _nir
 '''
-class execute_plan(Task):
+#class execute_plan(Task):
+class execute_plan():
     def setTelescope(self):
         self.tel = TelescopeController()
         return 0
@@ -143,7 +143,8 @@ class execute_plan_nir(execute_plan):
     Call a process with a folder and an image number as parameter who will create the
     calibration for an image
 '''
-class create_calibrations(Task):
+#class create_calibrations(Task):
+class create_calibrations():
     logger = setupLogger("calibrations", "calibrations")
     def log(self, message: str) -> int:
@@ -210,6 +211,7 @@ class create_calibrations(Task):
         self.execute()
         return self.end()
-class night_calibrations(Task):
+#class night_calibrations(Task):
+class night_calibrations():
     def run(self):
         return 0
 \ No newline at end of file
@@ -1,29 +0,0 @@
-from __future__ import absolute_import, unicode_literals
-
-
-# This will make sure the app is always imported when
-# Django starts so that shared_task will use this app.
-from .celery import app as celery_app
-
-# EP : normalement aussi, toutes ces autres lignes sont inutiles, à tester
-from celery.signals import worker_ready
-from django.conf import settings
-
-# EP : normalement, il faudrait a jouter cette ligne, à tester
-#__all__ = ['celery_app']
-
-
-# (if CELERY on) Start agents
-if settings.USE_CELERY:
-    @worker_ready.connect
-    def start_permanent_tasks(signal, sender):
-        import monitoring.tasks
-        import alert_manager.tasks
-        import majordome.tasks
-
-        if sender.hostname == "pyros@monitoring":
-            monitoring.tasks.Monitoring.delay()
-        elif sender.hostname == "pyros@majordome":
-            majordome.tasks.Majordome.delay()
-        elif sender.hostname == "pyros@alert_listener":
-            alert_manager.tasks.AlertListener.delay()
@@ -1,52 +0,0 @@
-# First we import absolute_imports from the future, so that our celery.py module won’t clash with the library
-from __future__ import absolute_import, unicode_literals
-
-import os
-from celery import Celery
-
-# TODO: normalement, pas necessaire : a virer ?
-from django.conf import settings
-
-
-# Set the default DJANGO_SETTINGS_MODULE environment variable for the celery command-line program
-# We don’t really need this line, but it saves us from always passing in the settings module to the celery program. 
-# It must always come before creating the app instances, as is what we do next
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'pyros.settings')
-
-app = Celery('pyros')
-
-# Using a string here means the worker doesn't have to serialize
-# the configuration object to child processes.
-# - namespace='CELERY' means all celery-related configuration keys
-#   should have a `CELERY_` prefix.
-app.config_from_object('django.conf:settings')
-# Celery 4:
-#app.config_from_object('django.conf:settings', namespace='CELERY')
-
-
-''' Load task modules from all registered Django app configs.
-This is a common practice for reusable apps : we define all tasks in a separate tasks.py module
-(1 for each django app), and Celery autodiscovers them
-'''
-# EP : normalement, la 1ere ligne devrait suffire, à tester
-#app.autodiscover_tasks()
-app.autodiscover_tasks(lambda: settings.INSTALLED_APPS)
-
-''' Celery will automatically discover tasks from all our installed apps, following the tasks.py convention:
-- app1/
-    - tasks.py
-    - models.py
-- app2/
-    - tasks.py
-    - models.py
-    
-This way we don’t have to manually add the individual modules to the CELERY_IMPORTS setting
-'''
-
-
-# Thisdebug_task example is a task that dumps its own request information. 
-# This is using the new bind=True task option introduced in Celery 3.1 
-# to easily refer to the current task instance (with 'self')
-@app.task(bind=True)
-def debug_task(self):
-    print("Request: {0!r}".format(self.request))
@@ -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']
 from __future__ import absolute_import
-from celery.task import Task
 from scheduler.Scheduler import Scheduler
 from common.models import *
 from utils.JDManipulator import *
@@ -7,7 +6,8 @@ from utils.Logger import setupLogger
 log = setupLogger("TaskSched", "TaskSched")
-class scheduling(Task):
+#class scheduling(Task):
+class scheduling():
     #TODO Remove first parameter (useless) -> maybe both ?
     def run(self, first_schedule=False, alert=False):