From ee19f9042709bf9121a96f6e5a044c6014fdc760 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Mon, 4 Jun 2018 13:10:04 +0200 Subject: [PATCH] use haystack.backends.elasticsearch_backend.ElasticsearchSearchEngine, fix email subject prefix --- app/settings.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/settings.py b/app/settings.py index 53358d04..64aae224 100644 --- a/app/settings.py +++ b/app/settings.py @@ -225,6 +225,7 @@ LOGIN_REDIRECT_URL = '/desk/lists/' EMAIL_HOST = 'cchum-kvm-telemeta.in2p3.fr' DEFAULT_FROM_EMAIL = 'root@cchum-kvm-telemeta.in2p3.fr' +EMAIL_SUBJECT_PREFIX = 'Telemeta - CREM' TIMESIDE_DEFAULT_GRAPHER_ID = 'waveform_centroid' TIMESIDE_DEFAULT_WAVEFORM_SIZES = ['346x130', '640x130'] @@ -314,8 +315,8 @@ from worker import app HAYSTACK_CONNECTIONS = { 'default': { - #'ENGINE': 'haystack.backends.elasticsearch_backend.ElasticsearchSearchEngine', - 'ENGINE': 'telemeta.util.backend.CustomElasticEngine', + 'ENGINE': 'haystack.backends.elasticsearch_backend.ElasticsearchSearchEngine', + #'ENGINE': 'telemeta.util.backend.CustomElasticEngine', 'URL': env('HAYSTACK_URL'), 'TIMEOUT': 60 * 5, 'INDEX_NAME': env('HAYSTACK_INDEX_NAME'), @@ -327,8 +328,8 @@ HAYSTACK_CONNECTIONS = { ] }, 'autocomplete': { - # 'ENGINE': 'haystack.backends.elasticsearch_backend.ElasticsearchSearchEngine', - 'ENGINE': 'telemeta.util.backend.CustomElasticEngine', + 'ENGINE': 'haystack.backends.elasticsearch_backend.ElasticsearchSearchEngine', + #'ENGINE': 'telemeta.util.backend.CustomElasticEngine', 'URL': env('HAYSTACK_URL'), 'TIMEOUT': 60 * 5, 'INDEX_NAME': env('HAYSTACK_INDEX_NAME_AUTOCOMPLETE'), @@ -342,8 +343,8 @@ HAYSTACK_CONNECTIONS = { } HAYSTACK_ROUTERS = ['telemeta.util.search_router.AutoRouter', 'haystack.routers.DefaultRouter'] -# HAYSTACK_SIGNAL_PROCESSOR = 'haystack.signals.RealtimeSignalProcessor' -HAYSTACK_SIGNAL_PROCESSOR = 'telemeta.util.search_signals.RealTimeCustomSignal' +HAYSTACK_SIGNAL_PROCESSOR = 'haystack.signals.RealtimeSignalProcessor' +#HAYSTACK_SIGNAL_PROCESSOR = 'telemeta.util.search_signals.RealTimeCustomSignal' HAYSTACK_SEARCH_RESULTS_PER_PAGE = 50 BOWER_COMPONENTS_ROOT = '/srv/bower/' -- 2.39.5