# HG changeset patch # User Tero Marttila # Date 1288668976 -7200 # Node ID 9fa9d881fd8768344b1dbd140b611a1f2d01f59a # Parent 29a523db66a8619b86e7ae9e0a9ee2a6a09a111b# Parent 86bbabd10ff6bd21e0ef06b2559c4a0d92c5f7f9 Merge with previous bin/rrdweb development, and fix up merge bugs diff -r 86bbabd10ff6 -r 9fa9d881fd87 .hgignore --- a/.hgignore Tue Nov 02 05:12:11 2010 +0200 +++ b/.hgignore Tue Nov 02 05:36:16 2010 +0200 @@ -1,3 +1,14 @@ +syntax: regexp + +# generated output ^www +^web/ +^img/ +^etc/mrtg-hosts.conf$ + +# shit \.pyc$ \.sw[op]$ + +# misc env setup +^rrd$ diff -r 86bbabd10ff6 -r 9fa9d881fd87 bin/rrdweb --- a/bin/rrdweb Tue Nov 02 05:12:11 2010 +0200 +++ b/bin/rrdweb Tue Nov 02 05:36:16 2010 +0200 @@ -139,7 +139,7 @@ logging.debug("%s: %s", target, html_path) # render - open(html_path, 'w').write(formatter.target(target, title)) + open(html_path, 'w').write(formatter.target(target, title).encode('utf-8')) def overview_html (targets, formatter) : """ @@ -155,7 +155,7 @@ logging.debug("%s", overview_path) # as (target, title) pairs - open(overview_path, 'w').write(formatter.overview((target, target) for target in targets)) + open(overview_path, 'w').write(formatter.overview('/', ((target, target) for target in targets)).encode('utf-8')) def generate_target (target, formatter) : diff -r 86bbabd10ff6 -r 9fa9d881fd87 bin/rrdweb.cgi --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/bin/rrdweb.cgi Tue Nov 02 05:36:16 2010 +0200 @@ -0,0 +1,23 @@ +#!/usr/bin/env python2.5 + +""" + Simple test server/environment for WSGI development +""" + +from rrdweb import wsgi + +from wsgiref.handlers import CGIHandler +import logging + +if __name__ == '__main__' : + logging.basicConfig(format="%(filename)s:%(lineno)d : %(message)s", level=logging.WARN) + + app = wsgi.WSGIApp( + rrdpath = 'rrd/', + tplpath = 'etc/templates', + imgpath = 'img/', + ) + + # run + CGIHandler().run(app) + diff -r 86bbabd10ff6 -r 9fa9d881fd87 etc/templates/layout.html --- a/etc/templates/layout.html Tue Nov 02 05:12:11 2010 +0200 +++ b/etc/templates/layout.html Tue Nov 02 05:36:16 2010 +0200 @@ -2,26 +2,28 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> - Päivölä Network + Päivölä Network - %(title)s

+ + %(content)s

diff -r 86bbabd10ff6 -r 9fa9d881fd87 etc/templates/overview-subdir.html --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/etc/templates/overview-subdir.html Tue Nov 02 05:36:16 2010 +0200 @@ -0,0 +1,3 @@ +

+ %(dir_name)s/ +

diff -r 86bbabd10ff6 -r 9fa9d881fd87 etc/templates/overview.html --- a/etc/templates/overview.html Tue Nov 02 05:12:11 2010 +0200 +++ b/etc/templates/overview.html Tue Nov 02 05:36:16 2010 +0200 @@ -1,6 +1,10 @@ -

Daily Overview

Daily Overview for %(dir)s

+ %(overview_subdirs)s +

%(overview_graphs)s

%(name)s

/', endpoint=index), + Rule('/.rrd', endpoint=target), + Rule('/.rrd/.png', endpoint=graph, defaults=dict(interval = 'daily')), + Rule('/.rrd//.png', endpoint=graph), + )) + + diff -r 86bbabd10ff6 -r 9fa9d881fd87 wsgi-dev.py --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/wsgi-dev.py Tue Nov 02 05:36:16 2010 +0200 @@ -0,0 +1,27 @@ +""" + Simple test server/environment for WSGI development +""" + +import werkzeug + +from rrdweb import wsgi + +import logging + + +if __name__ == '__main__' : + logging.basicConfig(format="[%(levelname)5s] %(funcName)25s : %(message)s", level=logging.DEBUG) + + app = wsgi.WSGIApp( + rrdpath = 'rrd/', + tplpath = 'etc/templates', + imgpath = 'img/', + ) + + # run + werkzeug.run_simple('localhost', 8081, app, use_reloader=True, use_debugger=True, + static_files = { + '/static': 'static/', + }, + ) +