From 9fb0b9c60afdc689a48b8f9f2f81b1e4d1019e56 Mon Sep 17 00:00:00 2001
From: dev <dev@welterde.de>
Date: Tue, 2 Sep 2008 06:42:17 +0000
Subject: [PATCH] improved service(removed _static handling, added
memcached-usage)
---
www.i2p2/app.py | 21 +++++++--------------
www.i2p2/generate.py | 4 ++--
2 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/www.i2p2/app.py b/www.i2p2/app.py
index 32da5bd71..ebc791d89 100644
--- a/www.i2p2/app.py
+++ b/www.i2p2/app.py
@@ -1,7 +1,7 @@
-from werkzeug import BaseRequest, BaseResponse, ETagResponseMixin, escape, run_simple, SharedDataMiddleware
+from werkzeug import BaseRequest, BaseResponse, ETagResponseMixin, escape, run_simple
from werkzeug.exceptions import HTTPException
from werkzeug.routing import RequestRedirect
-from jinja import Environment, FileSystemLoader
+from jinja import Environment, FileSystemLoader, MemcachedFileSystemLoader
from jinja.exceptions import TemplateNotFound
import os
import sha
@@ -21,13 +21,10 @@ class Response(BaseResponse, ETagResponseMixin):
# setup jinja
-env = Environment(loader=FileSystemLoader('pages', use_memcache=True))
-
-def read_mirrors():
- file = open('mirrors', 'r')
- dat = file.read()
- file.close()
- return dat.split('\n')
+try:
+ env = Environment(loader=MemcachedFileSystemLoader('pages', memcache_host=['127.0.0.1:11211']))
+except RuntimeError:
+ env = Environment(loader=FileSystemLoader('pages', use_memcache=True))
def app(environ, start_response):
"""The WSGI application that connects all together."""
@@ -50,14 +47,10 @@ def app(environ, start_response):
tmpl = env.get_template(path + '.html')
except TemplateNotFound:
tmpl = env.get_template('not_found.html')
- resp = Response(tmpl.render(), mimetype=mime_type)
+ resp = Response(tmpl.render(static=False), mimetype=mime_type)
resp.add_etag()
resp.make_conditional(req)
return resp(environ, start_response)
-app = SharedDataMiddleware(app, {
- '/_static': os.path.join(os.path.dirname(__file__), 'static'),
- '/.bzr': os.path.join(os.path.dirname(__file__), '../.bzr')
-})
if __name__ == '__main__':
run_simple('localhost', 5009, app)
diff --git a/www.i2p2/generate.py b/www.i2p2/generate.py
index f4ca85420..f37b93d7d 100644
--- a/www.i2p2/generate.py
+++ b/www.i2p2/generate.py
@@ -18,9 +18,9 @@ def get_files(folder):
yield fn
for filename in get_files('pages'):
+ print filename
filename = filename.split('/', 2)[1]
t = env.get_template(filename)
f = open(os.path.join('out', filename), 'w')
f.write(t.render(static=True).encode('utf-8'))
- f.close()
- print filename
\ No newline at end of file
+ f.close()
\ No newline at end of file
--
GitLab