Merge 3ff800c into 17bb174

yeastgenome · Feb 12, 2020 · 4982a02 · 4982a02
2 parents 17bb174 + 3ff800c
commit 4982a02
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 8 deletions.
diff --git a/src/phenotype_helpers.py b/src/phenotype_helpers.py
@@ -1447,7 +1447,9 @@ def get_one_phenotype(request):
 
         data['experiment_comment'] = row.experiment_comment
 
-        conditions = DBSession.query(PhenotypeannotationCond).filter_by(annotation_id=row.annotation_id, group_id=group_id).all()
+        conditions = []
+        if str(group_id).isdigit():
+            conditions = DBSession.query(PhenotypeannotationCond).filter_by(annotation_id=row.annotation_id, group_id=group_id).all()
 
         for condition in conditions:
             condition_name = condition.condition_name

diff --git a/system_config/cron/curation_crontab b/system_config/cron/curation_crontab
@@ -20,14 +20,20 @@
 # For more information see the manual pages of crontab(5) and cron(8)
 # 
 # m h  dom mon dow   command
-MAILTO=sgd-programmers@lists.stanford.edu
-0 * * * * /bin/bash /data/www/SGDBackend-NEX2/current/system_config/cron/restart.sh
+#Comment restart every hour as it is internal.
+#0 * * * * /bin/bash /data/www/SGDBackend-NEX2/current/system_config/cron/restart.sh | echo 'Backend restarted on curation - prod'
 0 0 * * * /bin/bash /data/www/SGDBackend-NEX2/current/system_config/cron/index_disambiguation.sh
-0 1 * * * /bin/bash /data/www/SGDBackend-NEX2/current/system_config/cron/index_elasticsearch.sh
-30 17 * * * /bin/bash /data/www/SGDBackend-NEX2/current/system_config/cron/refresh_cache.sh
-0 18 * * FRI /bin/bash /data/www/SGDBackend-NEX2/current/system_config/cron/load_reference_triage.sh
+#move index right before refresh_cache - 2/7/2020
+30 17 * * * /bin/bash /data/www/SGDBackend-NEX2/current/system_config/cron/index_elasticsearch.sh
+30 18 * * * /bin/bash /data/www/SGDBackend-NEX2/current/system_config/cron/refresh_cache.sh > /data/www/logs/refresh_cache.log 2>&1
+# assume the refresh_cache script is done running after 8hrs
+30 2 * * * /usr/bin/tail -62 /data/www/logs/refresh_cache.log
+0 18 * * 5 /bin/bash /data/www/SGDBackend-NEX2/current/system_config/cron/load_reference_triage.sh
 30 17 * * 1 /bin/bash /data/www/SGDBackend-NEX2/current/system_config/cron/go_update.sh
-30 19 * * 1 /bin/cp /data/www/SGDBackend-NEX2/current/scripts/dumping/curation/data/gene_association* /data/www/GO/
 29 17 * * 5 /bin/bash /data/www/SGDBackend-NEX2/current/system_config/cron/reference_update.sh
-30 17 15 * * /bin/bash /data/www/SGDBackend-NEX2/current/system_config/cron/dbxref_update.sh
+29 17 11 * * /bin/bash /data/www/SGDBackend-NEX2/current/system_config/cron/data_dump.sh
+29 17 13 * * /bin/bash /data/www/SGDBackend-NEX2/current/system_config/cron/ontology_update.sh
+29 17 15 * * /bin/bash /data/www/SGDBackend-NEX2/current/system_config/cron/dbxref_update.sh
+
+