JocondeLab » Erreur 404

# HG changeset patch # User ymh # Date 1390295996 -3600 # Node ID 7fb704ee75e7385b5c15ab4b1be03fff77765812 # Parent a565e7ca5cb3cb9100b8c0c692d2efa9b495a871 add cache control headers Use django global cache diff -r a565e7ca5cb3 -r 7fb704ee75e7 .settings/org.eclipse.core.resources.prefs --- a/.settings/org.eclipse.core.resources.prefs Tue Jan 21 01:59:39 2014 +0100 +++ b/.settings/org.eclipse.core.resources.prefs Tue Jan 21 10:19:56 2014 +0100 @@ -36,4 +36,5 @@ encoding//src/jocondelab/views/ajax.py=utf-8 encoding//src/jocondelab/views/back_office.py=utf-8 encoding//src/jocondelab/views/front_office.py=utf-8 +encoding//src/jocondelab/views/i18n.py=utf-8 encoding//virtualenv/web/env/venv_jocondelab/lib/python2.7/site-packages/django/conf/locale/vi/formats.py=utf-8 diff -r a565e7ca5cb3 -r 7fb704ee75e7 sbin/sync/config.py.tmpl --- a/sbin/sync/config.py.tmpl Tue Jan 21 01:59:39 2014 +0100 +++ b/sbin/sync/config.py.tmpl Tue Jan 21 10:19:56 2014 +0100 @@ -37,8 +37,6 @@ "P index/***", "P static/media/***", "P crossdomain.xml", - "P 404.html", - "P 500.html", ], 'venv': [ "+ core", diff -r a565e7ca5cb3 -r 7fb704ee75e7 src/jocondelab/config.py.tmpl --- a/src/jocondelab/config.py.tmpl Tue Jan 21 01:59:39 2014 +0100 +++ b/src/jocondelab/config.py.tmpl Tue Jan 21 10:19:56 2014 +0100 @@ -81,6 +81,9 @@ # Make this unique, and don't share it with anybody. SECRET_KEY = '%(secret_key)s' +#use etags +USE_ETAGS = False + #LOG_FILE = os.path.abspath(os.path.join(BASE_DIR,"../../run/log/log.txt")) LOG_FILE = '%(log_file)s' LOG_LEVEL = logging.DEBUG @@ -143,3 +146,11 @@ } } +CACHES = { + 'default': { + 'BACKEND': 'django.core.cache.backends.locmem.LocMemCache', + 'LOCATION': 'unique-snowflake' + } +} + +CACHE_MIDDLEWARE_SECONDS = 600 diff -r a565e7ca5cb3 -r 7fb704ee75e7 src/jocondelab/settings.py --- a/src/jocondelab/settings.py Tue Jan 21 01:59:39 2014 +0100 +++ b/src/jocondelab/settings.py Tue Jan 21 10:19:56 2014 +0100 @@ -106,6 +106,9 @@ # Make this unique, and don't share it with anybody. SECRET_KEY = '' +#use etags +USE_ETAGS = False + # List of callables that know how to import templates from various sources. TEMPLATE_LOADERS = ( 'django.template.loaders.filesystem.Loader', @@ -114,6 +117,7 @@ ) MIDDLEWARE_CLASSES = ( + 'django.middleware.cache.UpdateCacheMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.locale.LocaleMiddleware', 'django.middleware.common.CommonMiddleware', @@ -122,6 +126,7 @@ 'django.contrib.messages.middleware.MessageMiddleware', # Uncomment the next line for simple clickjacking protection: 'django.middleware.clickjacking.XFrameOptionsMiddleware', + 'django.middleware.cache.FetchFromCacheMiddleware', ) ROOT_URLCONF = 'jocondelab.urls' @@ -265,6 +270,8 @@ # 24 hours DB_QUERY_CACHE_TIME DB_QUERY_CACHE_TIME = 86400 +CACHE_MIDDLEWARE_SECONDS = 600 + from config import * # @UnusedWildImport if not "SRC_BASE_URL" in locals(): diff -r a565e7ca5cb3 -r 7fb704ee75e7 src/jocondelab/templates/400.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jocondelab/templates/400.html Tue Jan 21 10:19:56 2014 +0100 @@ -0,0 +1,12 @@ +{% extends "jocondelab/front_base.html" %} +{% load i18n %} + +{% block title %}JocondeLab » {% trans 'Erreur 404' %}{% endblock %} + +{% block breadcrumbs %}{% trans 'Erreur 404' %}{% endblock %} + +{% block main %} +

+{% trans "Cette page n'est pas disponible" %} +

+{% endblock %} diff -r a565e7ca5cb3 -r 7fb704ee75e7 src/jocondelab/templates/404.html --- a/src/jocondelab/templates/404.html Tue Jan 21 01:59:39 2014 +0100 +++ b/src/jocondelab/templates/404.html Tue Jan 21 10:19:56 2014 +0100 @@ -1,12 +1,12 @@ {% extends "jocondelab/front_base.html" %} {% load i18n %} -{% block title %}JocondeLab » {% trans 'Erreur 404' %}{% endblock %} +{% block title %}JocondeLab » {% trans 'Mauvaise requête' %}{% endblock %} -{% block breadcrumbs %}{% trans 'Erreur 404' %}{% endblock %} +{% block breadcrumbs %}{% trans 'Mauvaise requête' %}{% endblock %} {% block main %}

-{% trans "Cette page n'est pas disponible" %} +{% trans "Erreur dans la requête" %}

{% endblock %} diff -r a565e7ca5cb3 -r 7fb704ee75e7 src/jocondelab/urls.py --- a/src/jocondelab/urls.py Tue Jan 21 01:59:39 2014 +0100 +++ b/src/jocondelab/urls.py Tue Jan 21 10:19:56 2014 +0100 @@ -3,6 +3,7 @@ TermLinkSemanticLevelEdition, ThesaurusTree, TermListTableView) from jocondelab.views.front_office import (SearchView, NoticeView, GeoView, FrontTermListView) from jocondelab.views.ajax import (ContributeView, VoteView) +from jocondelab.views.i18n import cached_javascript_catalog from core import urls as core_urls from django.conf.urls import patterns, include, url from django.contrib import admin @@ -22,7 +23,7 @@ url(r'^logout/$', 'django.contrib.auth.views.logout_then_login', name='joconde_logout'), url(r'^admin/', include(admin.site.urls)), url(r'^i18n/', include('django.conf.urls.i18n')), - url(r'^jsi18n/$', 'django.views.i18n.javascript_catalog', js_info_dict), + url(r'^jsi18n/$', cached_javascript_catalog, js_info_dict), url(r'^bo/$', login_required(TermListView.as_view()), name='bo_home'), url(r'^bo/term/list/table$', login_required(TermListTableView.as_view()), name='term_list_table'), url(r'^bo/term/(?P\d+)/$', login_required(TermEditView.as_view()), name='term'), diff -r a565e7ca5cb3 -r 7fb704ee75e7 src/jocondelab/views/i18n.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/jocondelab/views/i18n.py Tue Jan 21 10:19:56 2014 +0100 @@ -0,0 +1,14 @@ +# -*- coding: utf-8 -*- +''' +Created on Jan 21, 2014 + +@author: ymh +''' +from django.utils import timezone +from django.views.decorators.http import last_modified +from django.views.i18n import javascript_catalog + +last_modified_date = timezone.now() +@last_modified(lambda req, **kw: last_modified_date) +def cached_javascript_catalog(request, domain='djangojs', packages=None): + return javascript_catalog(request, domain, packages) \ No newline at end of file diff -r a565e7ca5cb3 -r 7fb704ee75e7 web/404.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/404.html Tue Jan 21 10:19:56 2014 +0100 @@ -0,0 +1,338 @@ + + + + + + + + + + + + + + + JocondeLab » Erreur 404 + + + + + + + +

+ +

+ La page demandée n'est pas disponible. +

+ +

+ + + diff -r a565e7ca5cb3 -r 7fb704ee75e7 web/500.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/web/500.html Tue Jan 21 10:19:56 2014 +0100 @@ -0,0 +1,338 @@ + + + + + + + + + + + + + + + JocondeLab » Erreur d'application + + + + + + + +

+ +

+ Erreur sur le serveur. +

+ +

+ + +