Settings TIME_ZONE = 'UTC' for better portability

Etienne Pallier
1 parent 05bdcc44
Showing 3 changed files with 18 additions and 16 deletions Show diff stats
pyros.py
src/pyros/settings.py
src/routine_manager/RequestSerializer.py
@@ -695,6 +695,16 @@ class Pyros(AManager):
         self.printFullTerm(Colors.WARNING, "SUMMARY")
  
         #
+        # 2) (if not USE_CELERY) Start Agents
+        #
+        if TOTAL and not USE_CELERY :
+            # Start Environment Monitoring Agent
+            # Start Majordome Agent
+            # Start Alert Manager Agent
+            self.start_agents()
+            # Needed ?
+            self.sleep(3)
+        #
         # 2) (if USE_CELERY) Start Celery workers
         #
         if USE_CELERY:
@@ -738,17 +748,6 @@ class Pyros(AManager):
             self.changeDirectory("..")
         '''
  
-        #
-        # 4) (if not USE_CELERY) Start Agents
-        #
-        # TODO:
-        if TOTAL and not USE_CELERY :
-            # Start Environment Monitoring Agent
-            # Start Majordome Agent
-            # Start Alert Manager Agent
-            self.start_agents()
-            self.sleep(3)
-
         # When simulators are finished:
         #self.kill_simulation()
         return 0
@@ -184,11 +184,13 @@ AUTH_PASSWORD_VALIDATORS = [
 # https://docs.djangoproject.com/en/1.9/topics/i18n/
  
  
-#LANGUAGE_CODE = 'en-us'
-LANGUAGE_CODE = 'fr-FR'
+LANGUAGE_CODE = 'en-us'
+#LANGUAGE_CODE = 'fr-FR'
  
-#TIME_ZONE = 'UTC'
-TIME_ZONE = 'Europe/Paris'
+# UTC = FR - 2h in summer
+# UTC = FR - 1h in winter
+TIME_ZONE = 'UTC'
+#TIME_ZONE = 'Europe/Paris'
  
 # If you set this to False, Django will make some optimizations so as not
 # to load the internationalization machinery.
@@ -203,7 +205,6 @@ USE_L10N = True
 # If true => "updated" fields in weatherwatch or sitewatch will be saved as UTC time
 # If false => "updated" fields in weatherwatch or sitewatch will be saved as UTC+1 time (French time)
 # (Was) Necessary for "pyros test" (no more necessary now because fixtures dates have been converted to naive format without time zone) :
-# TODO: fix this
 # Necessary for ENV monitoring :
 USE_TZ = False
 #USE_TZ = True
@@ -88,6 +88,8 @@ class RequestSerializer():
         for sequence, albums in self.sequences:
             if self.relative:
                 # 86400 = nb seconds in 24 h
+                # time.localtime(time.time()) donne l'heure française
+                # time.gmttime(time.time()) donne l'heure gmt
                 sequence.jd1 = (time.time() + float(sequence.jd1)) / 86400 + TIMESTAMP_JD
                 sequence.jd2 = (time.time() + float(sequence.jd2)) / 86400 + TIMESTAMP_JD
                 #print("********* jd1,jd2 ", sequence.jd1, sequence.jd2)