Skip to content

Commit

Permalink
Do not disable existing loggers (#276)
Browse files Browse the repository at this point in the history
  • Loading branch information
tschorr authored and pbauer committed May 18, 2018
1 parent e413288 commit 52a0a3d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
3 changes: 3 additions & 0 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,9 @@ Bugfixes

- Use log.warning to avoid deprecation warning for log.warn

- Keep existing loggers
(`#276 <https://github.com/zopefoundation/Zope/pull/276>`)

- Accept bytes and text as cookie value.
(`#263 <https://github.com/zopefoundation/Zope/pull/263>`_)

Expand Down
3 changes: 2 additions & 1 deletion src/Zope2/Startup/serve.py
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,8 @@ def setup_logging(config_uri, global_conf=None, # NOQA
here=os.path.dirname(config_file))
if global_conf:
full_global_conf.update(global_conf)
return fileConfig(config_file, full_global_conf)
return fileConfig(
config_file, full_global_conf, disable_existing_loggers=False)


class ServeCommand(object):
Expand Down

0 comments on commit 52a0a3d

Please sign in to comment.