Merge pull request #2921 from chaoss/fix-contribiutor-breadth

Run machine learning and contributor breadth every 30 days

augur/tasks/init/celery_app.py

@@ -217,9 +217,9 @@ def setup_periodic_tasks(sender, **kwargs):
         sender.add_periodic_task(collection_interval, augur_collection_monitor.s())
 
         #Do longer tasks less often
-        non_domain_collection_interval = collection_interval * 300
-        logger.info(f"Scheduling non-repo-domain collection every {non_domain_collection_interval/60} minutes")
-        sender.add_periodic_task(non_domain_collection_interval, non_repo_domain_tasks.s())
+        logger.info(f"Scheduling data analysis every 30 days")
+        thirty_days_in_seconds = 30*24*60*60
+        sender.add_periodic_task(thirty_days_in_seconds, non_repo_domain_tasks.s())
 
         mat_views_interval = int(config.get_value('Celery', 'refresh_materialized_views_interval_in_days'))
         logger.info(f"Scheduling refresh materialized view every night at 1am CDT")
@@ -231,10 +231,6 @@ def setup_periodic_tasks(sender, **kwargs):
         logger.info(f"Setting 404 repos to be marked for retry on midnight each day")
         sender.add_periodic_task(crontab(hour=0, minute=0),retry_errored_repos.s())
 
-        logger.info(f"Scheduling contributor breadth every 30 days")
-        thirty_days_in_seconds = 30*24*60*60
-        sender.add_periodic_task(thirty_days_in_seconds, contributor_breadth_model.s())
-
 @after_setup_logger.connect
 def setup_loggers(*args,**kwargs):
     """Override Celery loggers with our own."""

augur/tasks/start_tasks.py

@@ -143,7 +143,7 @@ def non_repo_domain_tasks(self):
     enabled_tasks = []
 
     if not RUNNING_DOCKER and machine_learning_phase.__name__ in enabled_phase_names:
-        #enabled_tasks.extend(machine_learning_phase())
+        enabled_tasks.extend(machine_learning_phase())
         from augur.tasks.data_analysis.contributor_breadth_worker.contributor_breadth_worker import contributor_breadth_model
         enabled_tasks.append(contributor_breadth_model.si())