Merge pull request #42655 from whiteinge/rest_cherrypy-reenable-stats

Reenable cpstats for rest_cherrypy

salt/netapi/rest_cherrypy/app.py

@@ -467,14 +467,23 @@ import signal
 import tarfile
 from multiprocessing import Process, Pipe
 
+logger = logging.getLogger(__name__)
+
 # Import third-party libs
 # pylint: disable=import-error
 import cherrypy
+try:
+    from cherrypy.lib import cpstats
+except ImportError:
+    cpstats = None
+    logger.warn('Import of cherrypy.cpstats failed. '
+        'Possible upstream bug: '
+        'https://github.com/cherrypy/cherrypy/issues/1444')
+
 import yaml
 import salt.ext.six as six
 # pylint: enable=import-error
 
-
 # Import Salt libs
 import salt
 import salt.auth
@@ -483,8 +492,6 @@ import salt.utils.event
 # Import salt-api libs
 import salt.netapi
 
-logger = logging.getLogger(__name__)
-
 # Imports related to websocket
 try:
     from .tools import websockets
@@ -2446,13 +2453,6 @@ class Stats(object):
             :status 406: |406|
         '''
         if hasattr(logging, 'statistics'):
-            # Late import
-            try:
-                from cherrypy.lib import cpstats
-            except ImportError:
-                logger.error('Import of cherrypy.cpstats failed. Possible '
-                        'upstream bug here: https://github.com/cherrypy/cherrypy/issues/1444')
-                return {}
             return cpstats.extrapolate_statistics(logging.statistics)
 
         return {}
@@ -2559,13 +2559,14 @@ class API(object):
                 'tools.trailing_slash.on': True,
                 'tools.gzip.on': True,
 
-                'tools.cpstats.on': self.apiopts.get('collect_stats', False),
-
                 'tools.html_override.on': True,
                 'tools.cors_tool.on': True,
             },
         }
 
+        if cpstats and self.apiopts.get('collect_stats', False):
+            conf['/']['tools.cpstats.on'] = True
+
         if 'favicon' in self.apiopts:
             conf['/favicon.ico'] = {
                 'tools.staticfile.on': True,