Remove cachalot usage

arkindex/project/config.py

@@ -139,10 +139,6 @@ def get_settings_parser(base_dir):
 
     parser.add_option('cache', default={}, type=cache_validator)
 
-    cachalot_parser = parser.add_subparser('cachalot', allow_extra_keys=False, default={})
-    cachalot_parser.add_option('enabled', type=bool, default=False)
-    cachalot_parser.add_option('timeout', type=int, default=7200)
-
     s3_parser = ConfigParser()
     s3_parser.add_option('access_key_id', type=str, default=None)
     s3_parser.add_option('secret_access_key', type=str, default=None)

arkindex/project/settings.py

@@ -287,27 +287,6 @@ elif conf['cache']['type'] == CacheType.Dummy:
         }
     }
 
-# Cachalot (SQL cache) configuration
-# Only load the app when enabled, otherwise it still tries to cache some queries
-CACHALOT_ENABLED = conf['cachalot']['enabled']
-if CACHALOT_ENABLED:
-    CACHALOT_TIMEOUT = conf['cachalot']['timeout']
-    INSTALLED_APPS.append('cachalot')
-
-    # Limit Cachalot to base elements, images and corpus tables
-    CACHALOT_ONLY_CACHABLE_TABLES = (
-        'documents_corpus',
-        'documents_corpus',
-        'users_corpusright',
-        'users_user',
-        'documents_element',
-        'documents_elementpath',
-        'documents_elementtype',
-        'images_image',
-        'images_imageserver',
-        'images_zone',
-    )
-
 # Django Channels layer using Redis
 CHANNEL_LAYERS = {
     "default": {
@@ -526,8 +505,6 @@ try:
     import debug_toolbar.settings # noqa
     MIDDLEWARE.insert(0, 'debug_toolbar.middleware.DebugToolbarMiddleware')
     INSTALLED_APPS.append('debug_toolbar')
-    if CACHALOT_ENABLED:
-        DEBUG_TOOLBAR_PANELS = debug_toolbar.settings.PANELS_DEFAULTS + ['cachalot.panels.CachalotPanel', ]
 except ImportError:
     pass
 

arkindex/project/tests/config_samples/defaults.yaml

 allowed_hosts: []
 arkindex_env: dev
-cachalot:
-  enabled: false
-  timeout: 7200
 cache:
   path: null
   type: null

arkindex/project/tests/config_samples/override.yaml

 allowed_hosts:
 - something.com
 arkindex_env: prod
-cachalot:
-  enabled: true
-  timeout: 200
 cache:
   path: /
   type: filesystem

requirements.txt

@@ -7,7 +7,6 @@ git+https://gitlab.com/arkindex/common.git#egg=arkindex-common
 channels==2.4.0
 channels-redis==2.4.2
 django-admin-hstore-widget==1.1.0
-django-cachalot==2.3.2
 django-cors-headers==3.5.0
 django-enumfields==2.0.0
 django-redis==4.12.1