Merge branch 'master' of github.com:Pylons/pyramid

10 files changed, 289 insertions, 6 deletions

diff --git a/TODO.txt b/TODO.txt
index 80e700c00..63988e9eb 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -10,8 +10,7 @@ Must-Have (before 1.0)
   https://github.com/Pylons/pyramid/issues#issue/40,
   https://github.com/Pylons/pyramid/issues#issue/42,
   https://github.com/Pylons/pyramid/issues#issue/44,
-  https://github.com/Pylons/pyramid/issues#issue/94
-, https://github.com/Pylons/pyramid/issues#issue/95
+  https://github.com/Pylons/pyramid/issues#issue/95
 
 - Explain how to use i18n localization in Mako and Jinja2.  See also -
   http://groups.google.com/group/pylons-devel/msg/ab58353594b135c9 and
diff --git a/pyramid/paster.py b/pyramid/paster.py
index 80870b2ad..3c3a74a12 100644
--- a/pyramid/paster.py
+++ b/pyramid/paster.py
@@ -12,6 +12,11 @@ from pyramid.scripting import get_root
 class PyramidTemplate(Template):
     def pre(self, command, output_dir, vars): # pragma: no cover
         vars['random_string'] = os.urandom(20).encode('hex')
+        package_logger = vars['package']
+        if package_logger == 'root':
+            # Rename the app logger in the rare case a project is named 'root'
+            package_logger = 'app'
+        vars['package_logger'] = package_logger
         return Template.pre(self, command, output_dir, vars)
 
 class StarterProjectTemplate(PyramidTemplate):
diff --git a/pyramid/paster_templates/alchemy/development.ini_tmpl b/pyramid/paster_templates/alchemy/development.ini_tmpl
index 619b193dc..8433764e0 100644
--- a/pyramid/paster_templates/alchemy/development.ini_tmpl
+++ b/pyramid/paster_templates/alchemy/development.ini_tmpl
@@ -26,7 +26,7 @@ port = 6543
 # Begin logging configuration
 
 [loggers]
-keys = root, sqlalchemy
+keys = root, {{package_logger}}, sqlalchemy
 
 [handlers]
 keys = console
@@ -38,6 +38,11 @@ keys = generic
 level = INFO
 handlers = console
 
+[logger_{{package_logger}}]
+level = DEBUG
+handlers =
+qualname = {{package}}
+
 [logger_sqlalchemy]
 level = INFO
 handlers =
diff --git a/pyramid/paster_templates/alchemy/production.ini_tmpl b/pyramid/paster_templates/alchemy/production.ini_tmpl
new file mode 100644
index 000000000..1d21304db
--- /dev/null
+++ b/pyramid/paster_templates/alchemy/production.ini_tmpl
@@ -0,0 +1,65 @@
+[app:{{project}}]
+use = egg:{{project}}
+reload_templates = false
+debug_authorization = false
+debug_notfound = false
+debug_routematch = false
+debug_templates = false
+default_locale_name = en
+sqlalchemy.url = sqlite:///%(here)s/{{project}}.db
+
+[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 =
+
+[pipeline:main]
+pipeline =
+    weberror
+    egg:repoze.tm2#tm
+    {{project}}
+
+[server:main]
+use = egg:Paste#http
+host = 0.0.0.0
+port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root, {{package_logger}}, sqlalchemy
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[logger_{{package_logger}}]
+level = INFO
+handlers =
+qualname = {{package}}
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+
+# End logging configuration
diff --git a/pyramid/paster_templates/routesalchemy/development.ini_tmpl b/pyramid/paster_templates/routesalchemy/development.ini_tmpl
index 7f1d6af9b..8bd906553 100644
--- a/pyramid/paster_templates/routesalchemy/development.ini_tmpl
+++ b/pyramid/paster_templates/routesalchemy/development.ini_tmpl
@@ -26,7 +26,7 @@ port = 6543
 # Begin logging configuration
 
 [loggers]
-keys = root, sqlalchemy
+keys = root, {{package_logger}}, sqlalchemy
 
 [handlers]
 keys = console
@@ -38,6 +38,11 @@ keys = generic
 level = INFO
 handlers = console
 
+[logger_{{package_logger}}]
+level = DEBUG
+handlers =
+qualname = {{package}}
+
 [logger_sqlalchemy]
 level = INFO
 handlers =
diff --git a/pyramid/paster_templates/routesalchemy/production.ini_tmpl b/pyramid/paster_templates/routesalchemy/production.ini_tmpl
new file mode 100644
index 000000000..1d21304db
--- /dev/null
+++ b/pyramid/paster_templates/routesalchemy/production.ini_tmpl
@@ -0,0 +1,65 @@
+[app:{{project}}]
+use = egg:{{project}}
+reload_templates = false
+debug_authorization = false
+debug_notfound = false
+debug_routematch = false
+debug_templates = false
+default_locale_name = en
+sqlalchemy.url = sqlite:///%(here)s/{{project}}.db
+
+[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 =
+
+[pipeline:main]
+pipeline =
+    weberror
+    egg:repoze.tm2#tm
+    {{project}}
+
+[server:main]
+use = egg:Paste#http
+host = 0.0.0.0
+port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root, {{package_logger}}, sqlalchemy
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[logger_{{package_logger}}]
+level = INFO
+handlers =
+qualname = {{package}}
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+
+# End logging configuration
diff --git a/pyramid/paster_templates/starter/development.ini_tmpl b/pyramid/paster_templates/starter/development.ini_tmpl
index 574062b30..60e52da57 100644
--- a/pyramid/paster_templates/starter/development.ini_tmpl
+++ b/pyramid/paster_templates/starter/development.ini_tmpl
@@ -20,7 +20,7 @@ port = 6543
 # Begin logging configuration
 
 [loggers]
-keys = root
+keys = root, {{package_logger}}
 
 [handlers]
 keys = console
@@ -32,6 +32,11 @@ keys = generic
 level = INFO
 handlers = console
 
+[logger_{{package_logger}}]
+level = DEBUG
+handlers =
+qualname = {{package}}
+
 [handler_console]
 class = StreamHandler
 args = (sys.stderr,)
diff --git a/pyramid/paster_templates/starter/production.ini_tmpl b/pyramid/paster_templates/starter/production.ini_tmpl
new file mode 100644
index 000000000..31bc97b33
--- /dev/null
+++ b/pyramid/paster_templates/starter/production.ini_tmpl
@@ -0,0 +1,63 @@
+[app:{{project}}]
+use = egg:{{project}}
+reload_templates = false
+debug_authorization = false
+debug_notfound = false
+debug_routematch = false
+debug_templates = false
+default_locale_name = en
+
+[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 =
+
+[pipeline:main]
+pipeline =
+    weberror
+    {{project}}
+
+[server:main]
+use = egg:Paste#http
+host = 0.0.0.0
+port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root, {{package_logger}}
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[logger_{{package_logger}}]
+level = INFO
+handlers =
+qualname = {{package}}
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+
+# End logging configuration
diff --git a/pyramid/paster_templates/zodb/development.ini_tmpl b/pyramid/paster_templates/zodb/development.ini_tmpl
index 0a88094b3..c95f5cff1 100644
--- a/pyramid/paster_templates/zodb/development.ini_tmpl
+++ b/pyramid/paster_templates/zodb/development.ini_tmpl
@@ -27,7 +27,7 @@ port = 6543
 # Begin logging configuration
 
 [loggers]
-keys = root
+keys = root, {{package_logger}}
 
 [handlers]
 keys = console
@@ -39,6 +39,11 @@ keys = generic
 level = INFO
 handlers = console
 
+[logger_{{package_logger}}]
+level = DEBUG
+handlers =
+qualname = {{package}}
+
 [handler_console]
 class = StreamHandler
 args = (sys.stderr,)
diff --git a/pyramid/paster_templates/zodb/production.ini_tmpl b/pyramid/paster_templates/zodb/production.ini_tmpl
new file mode 100644
index 000000000..1741763ae
--- /dev/null
+++ b/pyramid/paster_templates/zodb/production.ini_tmpl
@@ -0,0 +1,66 @@
+[app:{{project}}]
+use = egg:{{project}}
+reload_templates = false
+debug_authorization = false
+debug_notfound = false
+debug_routematch = false
+debug_templates = false
+default_locale_name = en
+zodb_uri = file://%(here)s/Data.fs?connection_cache_size=20000
+
+[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 =
+
+[pipeline:main]
+pipeline =
+    weberror
+    egg:repoze.zodbconn#closer
+    egg:repoze.tm#tm
+    {{project}}
+
+[server:main]
+use = egg:Paste#http
+host = 0.0.0.0
+port = 6543
+
+# Begin logging configuration
+
+[loggers]
+keys = root, {{package_logger}}
+
+[handlers]
+keys = console
+
+[formatters]
+keys = generic
+
+[logger_root]
+level = INFO
+handlers = console
+
+[logger_{{package_logger}}]
+level = INFO
+handlers =
+qualname = {{package}}
+
+[handler_console]
+class = StreamHandler
+args = (sys.stderr,)
+level = NOTSET
+formatter = generic
+
+[formatter_generic]
+format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s
+
+# End logging configuration