]> git.parisson.com Git - telemeta.git/commitdiff
cleanup
authorGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 14 Dec 2015 17:02:26 +0000 (18:02 +0100)
committerGuillaume Pellerin <guillaume.pellerin@ircam.fr>
Mon, 14 Dec 2015 17:02:26 +0000 (18:02 +0100)
app/sandbox/settings.py
telemeta/locale
telemeta/pages

index aa8ba06276766c9f39267e67ea720f18a277a850..7a1937b2dfed0d7bb7a4b1186ca7030cfd89308c 100644 (file)
@@ -178,7 +178,6 @@ TEMPLATE_CONTEXT_PROCESSORS = (
     'django.contrib.messages.context_processors.messages',
 )
 
-
 AUTHENTICATION_BACKENDS = (
     'django.contrib.auth.backends.ModelBackend',
     'ipauth.backend.RangeBackend',
@@ -280,18 +279,16 @@ LOGGING = {
     }
 }
 
+from celery_app import app
 # replace rabbitmq by localhost if you start your app outside docker-compose
 # BROKER_URL = 'amqp://guest:guest@broker//'
 BROKER_URL = 'redis://broker:6379/0'
-
 CELERY_IMPORTS = ("timeside.server.tasks",)
 CELERY_RESULT_BACKEND = 'djcelery.backends.database:DatabaseBackend'
 CELERY_TASK_SERIALIZER = 'json'
 CELERY_RESULT_SERIALIZER = 'json'
 CELERY_ACCEPT_CONTENT = ['application/json']
 
-from celery_app import app
-
 
 HAYSTACK_CONNECTIONS = {
     'default': {
@@ -300,7 +297,5 @@ HAYSTACK_CONNECTIONS = {
         'INDEX_NAME': 'haystack',
     },
 }
-
 HAYSTACK_SIGNAL_PROCESSOR = 'haystack.signals.RealtimeSignalProcessor'
-
 HAYSTACK_SEARCH_RESULTS_PER_PAGE = 50
index 4534a3d47e7909554637e87a637b1959db277941..91973b13f9dc9405052727c0c525d342dee15562 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 4534a3d47e7909554637e87a637b1959db277941
+Subproject commit 91973b13f9dc9405052727c0c525d342dee15562
index 771dfcc58e26f43a507c3bc48fcb5ddde55ca0b1..f8324093174d077b674ac2c52eb0db6eaf815ab5 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 771dfcc58e26f43a507c3bc48fcb5ddde55ca0b1
+Subproject commit f8324093174d077b674ac2c52eb0db6eaf815ab5