summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-08-27 21:03:38 +0000
committerGerrit Code Review <review@openstack.org>2014-08-27 21:03:38 +0000
commitd9f8229c0ee3464fb7414a75cbbfe27cf1aed1b8 (patch)
tree237fd718898258a7c8782908fe2b4a0702ddbb5e
parent5d1f3915e878d2293fdf88f9325e6350a6a3cbef (diff)
parent0596397e93b7735b36a9b898dc72be9cc1d1bbe7 (diff)
downloadpecan-d9f8229c0ee3464fb7414a75cbbfe27cf1aed1b8.tar.gz
Merge "Configure the root logger properly"
-rw-r--r--docs/source/configuration.rst3
-rw-r--r--docs/source/logging.rst2
-rw-r--r--pecan/scaffolds/base/config.py_tmpl2
-rw-r--r--pecan/scaffolds/rest-api/config.py_tmpl2
4 files changed, 4 insertions, 5 deletions
diff --git a/docs/source/configuration.rst b/docs/source/configuration.rst
index d1f9f83..47b0a43 100644
--- a/docs/source/configuration.rst
+++ b/docs/source/configuration.rst
@@ -194,8 +194,8 @@ dictionaries.
::
logging = {
+ 'root': {'level': 'INFO', 'handlers': ['console']},
'loggers': {
- 'root': {'level': 'INFO', 'handlers': ['console']},
'sqlalchemy.engine': {'level': 'INFO', 'handlers': ['console']},
'__force_dict__': True
},
@@ -208,5 +208,4 @@ dictionaries.
from myapp import conf
assert isinstance(conf.logging.loggers, dict)
- assert isinstance(conf.logging.loggers['root'], dict)
assert isinstance(conf.logging.loggers['sqlalchemy.engine'], dict)
diff --git a/docs/source/logging.rst b/docs/source/logging.rst
index 940c7af..0060a56 100644
--- a/docs/source/logging.rst
+++ b/docs/source/logging.rst
@@ -31,8 +31,8 @@ The default configuration defines one handler and two loggers.
server = { ... }
logging = {
+ 'root' : {'level': 'INFO', 'handlers': ['console']},
'loggers': {
- 'root' : {'level': 'INFO', 'handlers': ['console']},
'myapp': {'level': 'DEBUG', 'handlers': ['console']}
},
'handlers': {
diff --git a/pecan/scaffolds/base/config.py_tmpl b/pecan/scaffolds/base/config.py_tmpl
index 696cc6a..6d70d5c 100644
--- a/pecan/scaffolds/base/config.py_tmpl
+++ b/pecan/scaffolds/base/config.py_tmpl
@@ -18,8 +18,8 @@ app = {
}
logging = {
+ 'root': {'level': 'INFO', 'handlers': ['console']},
'loggers': {
- 'root': {'level': 'INFO', 'handlers': ['console']},
'${package}': {'level': 'DEBUG', 'handlers': ['console']},
'pecan.commands.serve': {'level': 'DEBUG', 'handlers': ['console']},
'py.warnings': {'handlers': ['console']},
diff --git a/pecan/scaffolds/rest-api/config.py_tmpl b/pecan/scaffolds/rest-api/config.py_tmpl
index b0b3839..6713c20 100644
--- a/pecan/scaffolds/rest-api/config.py_tmpl
+++ b/pecan/scaffolds/rest-api/config.py_tmpl
@@ -12,8 +12,8 @@ app = {
}
logging = {
+ 'root': {'level': 'INFO', 'handlers': ['console']},
'loggers': {
- 'root': {'level': 'INFO', 'handlers': ['console']},
'${package}': {'level': 'DEBUG', 'handlers': ['console']},
'pecan.commands.serve': {'level': 'DEBUG', 'handlers': ['console']},
'py.warnings': {'handlers': ['console']},