From 1af7e98c1afeeeb40747688fc5f393f98062f6a3 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Wed, 10 Oct 2012 08:14:37 -0400 Subject: added module-level Bcfg2.Statistics object for easier tracking --- src/lib/Bcfg2/Server/BuiltinCore.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/lib/Bcfg2/Server/BuiltinCore.py') diff --git a/src/lib/Bcfg2/Server/BuiltinCore.py b/src/lib/Bcfg2/Server/BuiltinCore.py index b62312828..5b9c3302c 100644 --- a/src/lib/Bcfg2/Server/BuiltinCore.py +++ b/src/lib/Bcfg2/Server/BuiltinCore.py @@ -5,6 +5,7 @@ import sys import time import socket import daemon +import Bcfg2.Statistics from Bcfg2.Server.Core import BaseCore, NoExposedMethod from Bcfg2.Compat import xmlrpclib, urlparse from Bcfg2.SSLServer import XMLRPCServer @@ -56,7 +57,8 @@ class Core(BaseCore): try: result = method_func(*args) finally: - self.stats.add_value(method, time.time() - method_start) + Bcfg2.Statistics.stats.add_value(method, + time.time() - method_start) except xmlrpclib.Fault: raise except Exception: @@ -89,7 +91,9 @@ class Core(BaseCore): err = sys.exc_info()[1] self.logger.error("Server startup failed: %s" % err) self.context.close() + return False self.server.register_instance(self) + return True def _block(self): try: -- cgit v1.2.3-1-g7c22