clean up, consolidate config.json, celery hooks

docker_assets/run.sh

@@ -17,7 +17,7 @@ python manage.py ta_startup
 
 # start all tasks
 nginx &
-celery -A home.celery worker --loglevel=INFO --max-tasks-per-child 10 &
-celery -A home beat --loglevel=INFO \
+celery -A task.celery worker --loglevel=INFO --max-tasks-per-child 10 &
+celery -A task beat --loglevel=INFO \
     --scheduler django_celery_beat.schedulers:DatabaseScheduler &
 uwsgi --ini uwsgi.ini

tubearchivist/appsettings/src/config.py

@@ -29,7 +29,7 @@ class AppConfig:
 
     def get_config_file(self):
         """read the defaults from config.json"""
-        with open("home/config.json", "r", encoding="utf-8") as f:
+        with open("appsettings/config.json", "r", encoding="utf-8") as f:
             config_file = json.load(f)
 
         return config_file

tubearchivist/config/settings.py

@@ -49,7 +49,6 @@ ALLOWED_HOSTS, CSRF_TRUSTED_ORIGINS = ta_host_parser(
 
 INSTALLED_APPS = [
     "django_celery_beat",
-    "home.apps.HomeConfig",
     "django.contrib.admin",
     "django.contrib.auth",
     "django.contrib.contenttypes",

tubearchivist/home/__init__.py

@@ -1,7 +0,0 @@
-"""start celery app"""
-
-from __future__ import absolute_import, unicode_literals
-
-from home.celery import app as celery_app
-
-__all__ = ("celery_app",)

tubearchivist/home/apps.py

@@ -1,10 +0,0 @@
-"""handle custom startup functions"""
-
-from django.apps import AppConfig
-
-
-class HomeConfig(AppConfig):
-    """call startup funcs"""
-
-    default_auto_field = "django.db.models.BigAutoField"
-    name = "home"

tubearchivist/task/__init__.py

@@ -0,0 +1,7 @@
+"""start celery app"""
+
+from __future__ import absolute_import, unicode_literals
+
+from task.celery import app as celery_app
+
+__all__ = ("celery_app",)

tubearchivist/task/src/task_manager.py

@@ -5,7 +5,7 @@ functionality:
 """
 
 from common.src.ta_redis import RedisArchivist, TaskRedis
-from home.celery import app as celery_app
+from task.celery import app as celery_app
 from task.src.task_config import TASK_CONFIG