Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge pull request #8 from virhilo/master

updated to pyramid 1.2
  • Loading branch information...
commit 9e78f5e64f9150061ad2ea2531db7a83402a3f97 2 parents 00a7772 + bb6f937
@mcdonc mcdonc authored
Showing with 31 additions and 44 deletions.
  1. +4 −11 development.ini
  2. +22 −28 production.ini
  3. +5 −5 setup.py
View
15 development.ini
@@ -1,5 +1,6 @@
-[app:shootout]
+[app:main]
use = egg:shootout
+
reload_templates = true
debug_authorization = false
debug_notfound = false
@@ -11,18 +12,10 @@ session.key = shootout
session.encrypt_key = mysecretencryptionkey
session.validate_key = mysecretvalidationkey
session.cookie_on_exception = true
+pyramid.includes = pyramid_debugtoolbar
+ pyramid_tm
sqlalchemy.url = sqlite:///%(here)s/shootout.db
-[pipeline:main]
-pipeline =
- egg:WebError#evalerror
- tm
- shootout
-
-[filter:tm]
-use = egg:repoze.tm2#tm
-commit_veto = repoze.tm:default_commit_veto
-
[server:main]
use = egg:Paste#http
host = 0.0.0.0
View
50 production.ini
@@ -1,36 +1,16 @@
-[app:shootout]
+[app:main]
use = egg:shootout
+
reload_templates = false
debug_authorization = false
debug_notfound = false
debug_routematch = false
debug_templates = false
default_locale_name = en
-sqlalchemy.url = sqlite:///%(here)s/shootout.db
+pyramid.includes = pyramid_tm
+ pyramid_exclog
-[filter:weberror]
-use = egg:WebError#error_catcher
-debug = false
-;error_log =
-;show_exceptions_in_wsgi_errors = true
-;smtp_server = localhost
-;error_email = janitor@example.com
-;smtp_username = janitor
-;smtp_password = "janitor's password"
-;from_address = paste@localhost
-;error_subject_prefix = "Pyramid Error"
-;smtp_use_tls =
-;error_message =
-
-[filter:tm]
-use = egg:repoze.tm2#tm
-commit_veto = repoze.tm:default_commit_veto
-
-[pipeline:main]
-pipeline =
- weberror
- tm
- shootout
+sqlalchemy.url = sqlite:///%(here)s/shootout.db
[server:main]
use = egg:Paste#http
@@ -40,13 +20,13 @@ port = 6543
# Begin logging configuration
[loggers]
-keys = root, shootout, sqlalchemy
+keys = root, shootout, sqlalchemy, exc_logger
[handlers]
-keys = console
+keys = console, exc_handler
[formatters]
-keys = generic
+keys = generic, exc_formatter
[logger_root]
level = WARN
@@ -57,6 +37,11 @@ level = WARN
handlers =
qualname = shootout
+[logger_exc_logger]
+level = ERROR
+handlers = exc_handler
+qualname = exc_logger
+
[logger_sqlalchemy]
level = WARN
handlers =
@@ -71,7 +56,16 @@ args = (sys.stderr,)
level = NOTSET
formatter = generic
+[handler_exc_handler]
+class = FileHandler
+args = ('%(here)s/exception.log',)
+level = ERROR
+formatter = exc_formatter
+
[formatter_generic]
format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+[formatter_exc_formatter]
+format = %(asctime)s %(message)s
+
# End logging configuration
View
10 setup.py
@@ -8,13 +8,13 @@
CHANGES = open(os.path.join(here, 'CHANGES.txt')).read()
requires = [
- 'setuptools',
'pyramid',
'SQLAlchemy',
'transaction',
- 'repoze.tm2>=1.0b1', # default_commit_veto
+ 'pyramid_tm',
+ 'pyramid_debugtoolbar',
+ 'pyramid_exclog',
'zope.sqlalchemy',
- 'WebError',
'pyramid_simpleform',
'cryptacular',
'pyramid_beaker',
@@ -25,7 +25,7 @@
requires.append('pysqlite')
setup(name='shootout',
- version='0.2.1',
+ version='0.2.2',
description='A generic idea discussion and rating app (Pyramid sample)',
long_description=README + '\n\n' + CHANGES,
classifiers=[
@@ -42,7 +42,7 @@
author_email="cguardia@yahoo.com, virhilo@gmail.com",
url='http://pylons-devel@googlegroups.com',
license="BSD-derived (http://www.repoze.org/LICENSE.txt)",
- keywords='web wsgi pyramid pylons example',
+ keywords='web wsgi bfg pyramid pylons example',
packages=find_packages(),
include_package_data=True,
zip_safe=False,
Please sign in to comment.
Something went wrong with that request. Please try again.