1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/CherryPyCore.py b/src/lib/Bcfg2/Server/CherryPyCore.py
index 79e939344..53f3de018 100644
--- a/src/lib/Bcfg2/Server/CherryPyCore.py
+++ b/src/lib/Bcfg2/Server/CherryPyCore.py
@@ -2,6 +2,7 @@
 
 import sys
 import time
+import Bcfg2.Statistics
 from Bcfg2.Compat import urlparse, xmlrpclib, b64decode
 from Bcfg2.Server.Core import BaseCore
 import cherrypy
@@ -84,7 +85,8 @@ class Core(BaseCore):
         try:
             body = handler(*rpcparams, **params)
         finally:
-            self.stats.add_value(rpcmethod, time.time() - method_start)
+            Bcfg2.Statistics.stats.add_value(rpcmethod,
+                                             time.time() - method_start)
 
         xmlrpcutil.respond(body, 'utf-8', True)
         return cherrypy.serving.response.body
@@ -112,6 +114,7 @@ class Core(BaseCore):
         cherrypy.config.update(config)
         cherrypy.tree.mount(self, '/', {'/': self.setup})
         cherrypy.engine.start()
+        return True
 
     def _block(self):
         cherrypy.engine.block()