Merge ea8047d into 578aa19

psiturk/experiment.py

@@ -174,7 +174,7 @@ def get_random_condcount(mode):
     """
     cutofftime = datetime.timedelta(minutes=-CONFIG.getint('Server Parameters',
                                                            'cutoff_time'))
-    starttime = datetime.datetime.now() + cutofftime
+    starttime = datetime.datetime.now(datetime.timezone.utc) + cutofftime
 
     try:
         conditions = json.load(
@@ -569,7 +569,7 @@ def enterexp():
         user = Participant.query.\
             filter(Participant.uniqueid == unique_id).one()
         user.status = STARTED
-        user.beginexp = datetime.datetime.now()
+        user.beginexp = datetime.datetime.now(datetime.timezone.utc)
         db_session.add(user)
         db_session.commit()
         resp = {"status": "success"}
@@ -686,7 +686,7 @@ def debug_complete():
             user = Participant.query.\
                 filter(Participant.uniqueid == unique_id).one()
             user.status = COMPLETED
-            user.endhit = datetime.datetime.now()
+            user.endhit = datetime.datetime.now(datetime.timezone.utc)
             db_session.add(user)
             db_session.commit()
         except:
@@ -714,7 +714,7 @@ def worker_complete():
             user = Participant.query.\
                 filter(Participant.uniqueid == unique_id).one()
             user.status = COMPLETED
-            user.endhit = datetime.datetime.now()
+            user.endhit = datetime.datetime.now(datetime.timezone.utc)
             db_session.add(user)
             db_session.commit()
             status = "success"

psiturk/models.py

@@ -67,7 +67,7 @@ def __init__(self, **kwargs):
         self.uniqueid = "{workerid}:{assignmentid}".format(**kwargs)
         self.status = 1
         self.codeversion = CODE_VERSION
-        self.beginhit = datetime.datetime.now()
+        self.beginhit = datetime.datetime.now(datetime.timezone.utc)
         for key in kwargs:
             setattr(self, key, kwargs[key])
 
@@ -283,7 +283,7 @@ def launch_new_campaign(cls, **kwargs):
             kwargs=_kwargs,
             trigger='interval', 
             minutes=new_campaign.minutes_between_rounds,
-            next_run_time=datetime.datetime.now()
+            next_run_time=datetime.datetime.now() #why is this not utc?
         )
 
         return new_campaign

psiturk/psiturk_config.py

@@ -70,5 +70,5 @@ def load_config(self):
         # port to a fixed number database url is also dynamic
         if 'ON_HEROKU' in os.environ:
             self.set('Server Parameters', 'port', os.environ['PORT'])
-            self.set('Database Parameters', 'database_url',
-                     os.environ['DATABASE_URL'])
+            if self.get('Database Parameters', 'use_heroku_db') == 'true':
+                self.set('Database Parameters', 'database_url', os.environ['DATABASE_URL'])