diff options
| author | Michael Merickel <michael@merickel.org> | 2014-11-10 00:16:44 -0600 |
|---|---|---|
| committer | Michael Merickel <michael@merickel.org> | 2014-11-10 00:16:44 -0600 |
| commit | 999945be5d5a3fb245cc3aee38ef1e3be2af6e41 (patch) | |
| tree | 20e94117b7329ebb751f47a2fb7fd9b03bc77ffc | |
| parent | c605ab67d2effab184a0f1f6d40553360e57ff11 (diff) | |
| parent | ba5444531cccf50e7d8b146f80cd22b1508f4bcf (diff) | |
| download | pyramid-999945be5d5a3fb245cc3aee38ef1e3be2af6e41.tar.gz pyramid-999945be5d5a3fb245cc3aee38ef1e3be2af6e41.tar.bz2 pyramid-999945be5d5a3fb245cc3aee38ef1e3be2af6e41.zip | |
Merge branch 'feature.generic-log-formatter'
| -rw-r--r-- | CHANGES.txt | 3 | ||||
| -rw-r--r-- | pyramid/scaffolds/alchemy/development.ini_tmpl | 2 | ||||
| -rw-r--r-- | pyramid/scaffolds/starter/development.ini_tmpl | 2 | ||||
| -rw-r--r-- | pyramid/scaffolds/zodb/development.ini_tmpl | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index 0605ed308..927e7ce2a 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -13,6 +13,9 @@ Features resources relative to the package in which the ``Configurator`` was created. See https://github.com/Pylons/pyramid/pull/1337 +- Added line numbers to the log formatters in the scaffolds to assist with + debugging. See https://github.com/Pylons/pyramid/pull/1326 + Bug Fixes --------- diff --git a/pyramid/scaffolds/alchemy/development.ini_tmpl b/pyramid/scaffolds/alchemy/development.ini_tmpl index e54a8609c..448803c8f 100644 --- a/pyramid/scaffolds/alchemy/development.ini_tmpl +++ b/pyramid/scaffolds/alchemy/development.ini_tmpl @@ -68,4 +68,4 @@ level = NOTSET formatter = generic [formatter_generic] -format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s +format = %(asctime)s %(levelname)-5.5s [%(name)s:%(lineno)s][%(threadName)s] %(message)s diff --git a/pyramid/scaffolds/starter/development.ini_tmpl b/pyramid/scaffolds/starter/development.ini_tmpl index 842cd61d9..c2a28e178 100644 --- a/pyramid/scaffolds/starter/development.ini_tmpl +++ b/pyramid/scaffolds/starter/development.ini_tmpl @@ -57,4 +57,4 @@ level = NOTSET formatter = generic [formatter_generic] -format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s +format = %(asctime)s %(levelname)-5.5s [%(name)s:%(lineno)s][%(threadName)s] %(message)s diff --git a/pyramid/scaffolds/zodb/development.ini_tmpl b/pyramid/scaffolds/zodb/development.ini_tmpl index f57d559bf..199ddfab4 100644 --- a/pyramid/scaffolds/zodb/development.ini_tmpl +++ b/pyramid/scaffolds/zodb/development.ini_tmpl @@ -62,4 +62,4 @@ level = NOTSET formatter = generic [formatter_generic] -format = %(asctime)s %(levelname)-5.5s [%(name)s][%(threadName)s] %(message)s +format = %(asctime)s %(levelname)-5.5s [%(name)s:%(lineno)s][%(threadName)s] %(message)s |