Restore file based logging for waitress

CHANGES.rst

@@ -24,7 +24,6 @@ Breaking changes:
 
 Bug fixes:
 
-
 - log level for Plone WSGI logger changed to INFO making the logging less
   verbose [ajung] (#66)
 - Improve debugging of run scripts by providing the source code for the

README.rst

@@ -224,12 +224,11 @@ log levels or configure `mailinglogger`.
 event-log
   The filename of the event log. Defaults to ${buildout:directory}/var/log/${partname}.log
   Setting this value to 'disable' will make the <eventlog> section to be omitted,
-  disabling logging events by default to a .log file. Used for ZServer only, not WSGI.
+  disabling logging events by default to a .log file.
 
 event-log-level
   Set the level of the console output for the event log. Level may be any of
   CRITICAL, ERROR, WARN, INFO, DEBUG, or ALL. Defaults to INFO.
-  Used for ZServer only, not WSGI.
 
 event-log-max-size
   Maximum size of event log file. Enables log rotation.
@@ -258,14 +257,15 @@ mailinglogger
 
   You will need to add `mailinglogger` to your buildout's egg section to make this work.
 
-z2-log
-  The filename for the Z2 access log. Defaults to var/log/${partname}-Z2.log.
+access-log, z2-log
+  The filename for the Z2 access log. Defaults to var/log/${partname}-Z2.log
+  (var/log/${partname}-access.log) for WSGI).
   Setting this value to 'disable' will make the <logger access> section to be omitted,
-  disabling logging access events to a .log file. Used for ZServer only, not WSGI.
+  disabling logging access events to a .log file.
 
-z2-log-level
+access-log-level, z2-log-level
   Set the log level for the access log. Level may be any of CRITICAL, ERROR,
-  WARN, INFO, DEBUG, or ALL. Defaults to WARN. Used for ZServer only, not WSGI.
+  WARN, INFO, DEBUG, or ALL. Defaults to WARN (INFO for WSGI).
 
 access-log-max-size
   Maximum size of access log file. Enables log rotation.

news/76.bugfix

@@ -0,0 +1,2 @@
+Restore log files for waitress.
+[tschorr]

setup.py

@@ -43,6 +43,7 @@
         'Zope >= 4.0b1',
         'ZODB >= 5.1.1',
         'ZEO',
+        'Paste',
     ],
     extras_require={
         'test': [

src/plone/recipe/zope2instance/recipe.py

@@ -333,7 +333,9 @@ def build_zope_conf(self):
             }
 
         z_log_name = os.path.sep.join(('log', self.name + '-Z2.log'))
-        z_log_name = options.get('z2-log', z_log_name)
+        z_log_name = options.get(
+            'z2-log',
+            options.get('access-log', z_log_name))
         if z_log_name.lower() == 'disable':
             access_event_log = ''
         else:
@@ -661,10 +663,48 @@ def build_wsgi_ini(self):
         listen = options.get('http-address', '0.0.0.0:8080')
         if ':' not in listen:
             listen = '0.0.0.0:{}'.format(listen)
+
+        base_dir = self.buildout['buildout']['directory']
+        var_dir = options.get('var', os.path.join(base_dir, 'var'))
+        default_eventlog = os.path.sep.join(
+            (var_dir, 'log', '{}.log'.format(self.name),))
+        eventlog_name = options.get('event-log', default_eventlog)
+        eventlog_level = options.get('event-log-level', 'INFO')
+
+        if eventlog_name.lower() == 'disable':
+            root_handlers = 'console'
+            event_handlers = ''
+        else:
+            root_handlers = 'console, eventlog'
+            event_handlers = 'eventlog'
+
+        default_accesslog = os.path.sep.join(
+            (var_dir, 'log', '{}-access.log'.format(self.name),))
+
+        accesslog_name = options.get(
+            'z2-log',
+            options.get('access-log', default_accesslog))
+        accesslog_level = options.get(
+            'access-log-level',
+            options.get('z2-log-level', 'INFO'))
+
+        if accesslog_name.lower() == 'disable':
+            pipeline = '\n    '.join(['egg:Zope#httpexceptions', 'zope'])
+            event_handlers = ''
+        else:
+            pipeline = '\n    '.join(
+                ['translogger', 'egg:Zope#httpexceptions', 'zope'])
         options = {
             'location': options['location'],
             'http_address': listen,
             'threads': options.get('threads', 4),
+            'eventlog_name': eventlog_name,
+            'root_handlers': root_handlers,
+            'event_handlers': event_handlers,
+            'accesslog_name': accesslog_name,
+            'pipeline': pipeline,
+            'eventlog_level': eventlog_level,
+            'accesslog_level': accesslog_level,
         }
         wsgi_ini = wsgi_ini_template % options
         with open(wsgi_ini_path, 'w') as f:
@@ -1197,35 +1237,61 @@ def render_file_storage(self, file_storage, blob_storage,
 use = egg:Zope#main
 zope_conf = %(location)s/etc/zope.conf
 
+[filter:translogger]
+use = egg:Paste#translogger
+setup_console_handler = False
+
 [pipeline:main]
 pipeline =
-    egg:Zope#httpexceptions
-    zope
+    %(pipeline)s
 
 [loggers]
-keys = root, plone
+keys = root, plone, waitress, wsgi
 
 [handlers]
-keys = console
+keys = console, accesslog, eventlog
 
 [formatters]
 keys = generic
 
 [logger_root]
-level = INFO
-handlers = console
+level = %(eventlog_level)s
+handlers = %(root_handlers)s
 
 [logger_plone]
-level = INFO
-handlers =
+level = %(eventlog_level)s
+handlers = %(event_handlers)s
 qualname = plone
 
+[logger_waitress]
+level = %(eventlog_level)s
+handlers = %(event_handlers)s
+qualname = waitress
+
+[logger_wsgi]
+level = %(accesslog_level)s
+handlers = accesslog
+qualname = wsgi
+propagate = 0
+
 [handler_console]
 class = StreamHandler
 args = (sys.stderr,)
 level = NOTSET
 formatter = generic
 
+[handler_accesslog]
+class = FileHandler
+args = ('%(accesslog_name)s','a')
+level = %(accesslog_level)s
+formatter = generic
+
+[handler_eventlog]
+class = FileHandler
+args = ('%(eventlog_name)s', 'a')
+level = NOTSET
+formatter = generic
+
 [formatter_generic]
 format = %%(asctime)s %%(levelname)-5.5s [%%(name)s:%%(lineno)s][%%(threadName)s] %%(message)s
 """  # noqa: E501