Majordome and monitoring ok

Jeremy
1 parent 4cb0ff36
Showing 5 changed files with 71 additions and 34 deletions Show diff stats
src/majordome/tasks.py
src/monitoring/tasks.py
src/pyros/__init__.py
src/pyros/settings.py
src/scripts/start_celery_workers.sh
 from __future__ import absolute_import
+from django.core.exceptions import ObjectDoesNotExist
 import scheduler
 import scheduler.tasks
 from celery.task import Task
@@ -31,6 +32,9 @@ class Majordome(Task):
     status_tel = ""
     status_nir = ""
     status_vis = ""
+    timers = {}
+    functions = {}
+    schedule = None
     majordome_status = "STARTING"
  
  
@@ -93,6 +97,8 @@ class Majordome(Task):
         self.night_end = getNightEnd()
         self.night_start_jd = secondsToJulianDate(getNightStart())
         self.night_end_jd = secondsToJulianDate(getNightEnd())
+        self.timer_night_start = self.night_start - getCurrentTime()
+        self.timer_night_end = self.night_end - getCurrentTime()
         self.timer_status = 5
         self.timer_plc = 2
         self.timer_schedule = 1
@@ -148,8 +154,13 @@ class Majordome(Task):
  
     def handleEnvironmentTimer(self):
         self.timers["environment"] = self.timer_plc
-        site_status = SiteWatch.objects.latest('updated')
-        weather_status = WeatherWatch.objects.latest('updated')
+        try:
+            site_status = SiteWatch.objects.latest('updated')
+            weather_status = WeatherWatch.objects.latest('updated')
+        except ObjectDoesNotExist:
+            if (settings.DEBUG):
+                log.info("No site_status or weather_status found in database")
+            return (1)
         self.handlePLC(site_status, weather_status)
         return (0)
  
@@ -172,12 +183,22 @@ class Majordome(Task):
         return (0)
  
     def handleScheduleTimer(self):
-        self.timers["scheduler"] = self.timer_schedule
+        self.timers["schedule"] = self.timer_schedule
         if (self.isValidStatus(self.status_tel)):
             if (self.schedule == None):
-                self.schedule = Schedule.objects.latest('created')
+                try:
+                    self.schedule = Schedule.objects.latest('created')
+                except ObjectDoesNotExist:
+                    if (settings.DEBUG):
+                        log.info("No schedule found in database")
+                    return (1)
             else:
-                schedule = Schedule.objects.latest('created')
+                try:
+                    schedule = Schedule.objects.latest('created')
+                except ObjectDoesNotExist:
+                    if (settings.DEBUG):
+                        log.info("No schedule found in database")
+                    return (1)
                 if (schedule.created != self.schedule.created):
                     self.next_sequence = None
                     self.schedule = schedule
@@ -204,10 +225,12 @@ class Majordome(Task):
             self.notifyTelescopeStatus("night_start")
         return (0)
  
+    def notifyTelescopeStatus(self, timer_name):
+        return (self.notifyDeviceStatus("telescope", timer_name, self.status_tel))
+
     def notifyDeviceStatus(self, device_name, timer_name, status):
-        Log.objects.create(agent=device_name, create=datetime.datetime.now(),
-                           message="The action : " + str(timer_name) + " has been canceled : Telescope status : "
-                                   + status)
+        Log.objects.create(agent=device_name, created=datetime.datetime.now(),
+                           message="The action : " + str(timer_name) + " has been canceled : Telescope status : " + str(status))
         # maybe reset some variables and do a scheduling
         return (0)
  
@@ -344,8 +367,9 @@ class Majordome(Task):
         Check if the instrument status is valid
     '''
     def isValidStatus(self, status):
-        if (status == "" or status == "ERROR"):
-            return (False)
+        # TODO REMOVE COMMENT AND CHANGE WHEN DEFINED
+        # if (status == "" or status == "ERROR"):
+        #     return (False)
         return (True)
  
     '''
@@ -380,3 +404,7 @@ class Majordome(Task):
  
         print("change_obs_conditions")
         pass
+
+if (__name__ == "__main__"):
+    m = Majordome()
+    m.run()
 \ No newline at end of file
@@ -11,7 +11,9 @@ log = L.setupLogger(&quot;MonitoringTaskLogger&quot;, &quot;Monitoring&quot;)
     Infinite task created at the program's start.
     Checks the plc status, parse it, analyse it, store it in db
 '''
-class monitoring(Task):
+class Monitoring(Task):
+    timers = {}
+    functions = {}
  
     def run(self):
         self.setContext()
@@ -24,14 +26,15 @@ class monitoring(Task):
         return (0)
  
     def setTime(self):
-        self.timer_status = 10
-        self.timers = {"timer_status", self.timer_status}
-        self.functions = {"timer_status", self.handleTimerStatus}
+        self.timer_status = 2
+        self.timers = {"timer_status": self.timer_status}
+        self.functions = {"timer_status": self.handleTimerStatus}
         return (0)
  
     def handleTimerStatus(self):
         self.timers["timer_status"] = self.timer_status
         self.status_plc = self.plc.get("STATUS")
+        print("handle Timer")
         # TODO: parse, analyse, store
         return (0)
  
@@ -41,12 +44,17 @@ class monitoring(Task):
             time.sleep(self.timers[minimal_timer])
             self.timers = {key: value - self.timers[minimal_timer] for key, value in self.timers.items()}
             for timer_name, timer_value in self.timers.items():
+                print("Loop")
                 if (timer_value <= 0):
-                    if (timer_name in self.function):
+                    if (timer_name in self.functions):
                         self.functions[timer_name]()
                     else:
                         if (settings.DEBUG):
                             log.info("Timer : " + str(timer_name) + "is not known by the monitoring")
                 if (settings.DEBUG):
                     log.info("Timer : " + str(timer_name) + " executed by monitoring")
-        return (0)
 \ No newline at end of file
+        return (0)
+
+if (__name__ == "__main__"):
+    m = Monitoring()
+    m.run()
 \ No newline at end of file
@@ -9,6 +9,12 @@ from django.conf import settings
 @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()
+        monitoring.tasks.Monitoring.delay()
+    elif sender.hostname == "pyros@majordome":
+        majordome.tasks.Majordome.delay()
+    elif sender.hostname == "pyros@alert_manager":
+        alert_manager.tasks.alert_listener.delay()
@@ -257,12 +257,9 @@ CELERY_QUEUES = {
     "alert_listener_q": {"exchange": "alert_listener_q", "routing_key": "alert_listener_q"},
     "analysis_q": {"exchange": "analysis_q", "routing_key": "analysis_q"},
     "system_status_q": {"exchange": "system_status_q", "routing_key": "system_status_q"},
-    "change_obs_conditions_q": {"exchange": "change_obs_conditions_q", "routing_key": "change_obs_conditions_q"},
     "monitoring_q": {"exchange": "monitoring_q", "routing_key": "monitoring_q"},
+    "majordome_q": {"exchange": "majordome_q", "routing_key": "majordome_q"},
     "scheduling_q": {"exchange": "scheduling_q", "routing_key": "scheduling_q"},
-    "execute_sequence_q": {"exchange": "execute_sequence_q", "routing_key": "execute_sequence_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"},
     "create_calibrations_q": {"exchange": "create_calibrations_q", "routing_key": "create_calibrations_q"},
 }
     # "simulator_q": {"exchange": "simulator_q", "routing_key": "simulator_q"},
@@ -270,11 +267,8 @@ CELERY_QUEUES = {
 CELERY_ROUTES = {
     "alert_manager.tasks.alert_listener": {"queue": "alert_listener_q"},
     "analyzer.tasks.analysis": {"queue": "analysis_q"},
-    "majordome.tasks.execute_sequence": {"queue": "execute_sequence_q"},
-    "majordome.tasks.system_pause": {"queue": "system_status_q"},
-    "majordome.tasks.system_restart": {"queue": "system_status_q"},
-    "majordome.tasks.change_obs_conditions": {"queue": "change_obs_conditions_q"},
-    "monitoring.tasks.monitoring": {"queue": "monitoring_q"},
+    "majordome.tasks.Majordome": {"queue": "majordome_q"},
+    "monitoring.tasks.Monitoring": {"queue": "monitoring_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"},
@@ -9,12 +9,13 @@ source ../private/venv_py3_pyros/bin/activate
  
 ./scripts/kill_celery_workers.sh
 celery worker -A pyros -Q alert_listener_q -n pyros@alert_listener -c 1 &
-celery worker -A pyros -Q scheduling_q --purge -n pyros@scheduling -c 1 &
-celery worker -A pyros -Q execute_sequence_q --purge -n pyros@execute_sequence -c 1 &
-celery worker -A pyros -Q execute_plan_vis_q --purge -n pyros@execute_plan_vis -c 1 &
-celery worker -A pyros -Q execute_plan_nir_q --purge -n pyros@execute_plan_nir -c 1 &
-celery worker -A pyros -Q create_calibrations_q --purge -n pyros@create_calibrations -c 1 &
-celery worker -A pyros -Q analysis_q --purge -n pyros@analysis -c 5 &
-celery worker -A pyros -Q system_status_q --purge -n pyros@system_status -c 1 &
-celery worker -A pyros -Q change_obs_conditions_q --purge -n pyros@change_obs_conditions -c 1 &
 celery worker -A pyros -Q monitoring_q -n pyros@monitoring -c 1 &
+celery worker -A pyros -Q majordome_q -n pyros@majordome -c 1 &
+# celery worker -A pyros -Q scheduling_q --purge -n pyros@scheduling -c 1 &
+# celery worker -A pyros -Q execute_sequence_q --purge -n pyros@execute_sequence -c 1 &
+# celery worker -A pyros -Q execute_plan_vis_q --purge -n pyros@execute_plan_vis -c 1 &
+# celery worker -A pyros -Q execute_plan_nir_q --purge -n pyros@execute_plan_nir -c 1 &
+# celery worker -A pyros -Q create_calibrations_q --purge -n pyros@create_calibrations -c 1 &
+# celery worker -A pyros -Q analysis_q --purge -n pyros@analysis -c 5 &
+# celery worker -A pyros -Q system_status_q --purge -n pyros@system_status -c 1 &
+# celery worker -A pyros -Q change_obs_conditions_q --purge -n pyros@change_obs_conditions -c 1 &