summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/BuiltinCore.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2012-10-10 08:14:37 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2012-10-10 12:10:10 -0400
commit1af7e98c1afeeeb40747688fc5f393f98062f6a3 (patch)
treefadf539ccf87c4b12e6d4f19a13681fcb383190e /src/lib/Bcfg2/Server/BuiltinCore.py
parent2f7b00a52b304a1db7fbfdfceafbd45217e29e9a (diff)
downloadbcfg2-1af7e98c1afeeeb40747688fc5f393f98062f6a3.tar.gz
bcfg2-1af7e98c1afeeeb40747688fc5f393f98062f6a3.tar.bz2
bcfg2-1af7e98c1afeeeb40747688fc5f393f98062f6a3.zip
added module-level Bcfg2.Statistics object for easier tracking
Diffstat (limited to 'src/lib/Bcfg2/Server/BuiltinCore.py')
-rw-r--r--src/lib/Bcfg2/Server/BuiltinCore.py6
1 files changed, 5 insertions, 1 deletions
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: