Skip to content

Commit

Permalink
Take logger schema back out; logging gets configured via the wsgi server
Browse files Browse the repository at this point in the history
  • Loading branch information
davisagli committed Oct 28, 2018
1 parent 56032ac commit bfbd34b
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 61 deletions.
55 changes: 0 additions & 55 deletions src/plone/recipe/zope2instance/wsgischema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,9 @@

<!-- type definitions -->

<import package="ZConfig.components.logger" file="handlers.xml"/>
<import package="ZConfig.components.logger" file="eventlog.xml"/>
<import package="ZODB"/>
<import package="tempstorage" condition="tempstorage"/>

<sectiontype name="logger" datatype="plone.recipe.zope2instance.zopectl.LoggerFactory">
<description>
This "logger" type only applies to access and request ("trace")
logging; event logging is handled by the "logging" package in
the Python standard library. The loghandler type used here is
provided by the "ZConfig.components.logger" package.
</description>
<key name="level"
datatype="ZConfig.components.logger.datatypes.logging_level"
default="info"/>
<multisection name="*"
type="ZConfig.logger.handler"
attribute="handlers"
required="yes"/>
</sectiontype>

<sectiontype name="environment"
datatype=".environment"
keytype="identifier">
Expand Down Expand Up @@ -414,43 +396,6 @@
<metadefault>off</metadefault>
</key>

<section type="eventlog" name="*" attribute="eventlog">
<description>
Describes what level of log output is desired and where it
should be written.
</description>
</section>

<section type="logger" name="access">
<description>
Describes the logging performed to capture the 'access' log,
which typically captures per-request data in common or combined
log format.
</description>
</section>

<section type="logger" name="trace">
<description>
Describes the logging performed to capture the 'trace' log,
which typically captures detailed per-request data useful for
Zope debugging.
</description>
</section>

<key name="conflict-error-log-level"
datatype="ZConfig.components.logger.datatypes.logging_level"
default="info">
<description>
Specifies at which level conflict errors are logged. Conflict
errors, when occurring in small numbers, are a normal part of the
Zope optimistic transaction conflict resolution algorithms. They
are retried automatically a few times, and are therefore usually
not visible by the user. You can specify 'notset' if you don't
want them logged, or use any other logger level.
</description>
<metadefault>info</metadefault>
</key>

<multisection type="ZODB.Database" name="+" attribute="databases">
<description>
Zope ZODB databases must have a name, and they are required to be
Expand Down
6 changes: 0 additions & 6 deletions src/plone/recipe/zope2instance/zopectl.py
Original file line number Diff line number Diff line change
Expand Up @@ -175,12 +175,6 @@ def realize(self, *args, **kw):
"zdrun.py")

self.exitcodes = [0, 2]
if self.logfile is None and config.eventlog is not None:
for handler in config.eventlog.handler_factories:
if isinstance(handler, FileHandlerFactory):
self.logfile = handler.section.path
if self.logfile not in ("STDERR", "STDOUT"):
break

def load_schema(self):
if self.schema is None:
Expand Down

0 comments on commit bfbd34b

Please sign in to comment.