From f3620a4cdf3aa39d6a09a0cb5a34470d6c74d456 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Fri, 9 Dec 2011 10:20:58 +0100 Subject: [PATCH] trying to hunt down verbose messages that started recently to appear in sfa_access_log - or so it seems - but to no avail. --- sfa/client/sfaclientlib.py | 3 +-- sfa/plc/plshell.py | 2 +- sfa/rspecs/versions/sfav1.py | 2 +- sfa/server/threadedserver.py | 3 ++- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sfa/client/sfaclientlib.py b/sfa/client/sfaclientlib.py index 979fbbbf..13a4831d 100644 --- a/sfa/client/sfaclientlib.py +++ b/sfa/client/sfaclientlib.py @@ -277,8 +277,7 @@ class SfaClientBootstrap: except IOError: raise except: - import traceback - traceback.print_exc() + self.logger.log_exc() raise Exception, "Could not produce/retrieve %s"%filename wrapped.__name__=f.__name__ return wrapped diff --git a/sfa/plc/plshell.py b/sfa/plc/plshell.py index ffe138df..93ee728d 100644 --- a/sfa/plc/plshell.py +++ b/sfa/plc/plshell.py @@ -69,7 +69,7 @@ class PlShell: 'Username': config.SFA_PLC_USER, 'AuthString': config.SFA_PLC_PASSWORD, } - self.proxy = xmlrpclib.Server(url, verbose = 0, allow_none = True) + self.proxy = xmlrpclib.Server(url, verbose = False, allow_none = True) def __getattr__(self, name): def func(*args, **kwds): diff --git a/sfa/rspecs/versions/sfav1.py b/sfa/rspecs/versions/sfav1.py index 7ec164d9..ec279715 100644 --- a/sfa/rspecs/versions/sfav1.py +++ b/sfa/rspecs/versions/sfav1.py @@ -114,7 +114,7 @@ class SFAv1(BaseVersion): SFAv1Sliver.add_sliver_attribute(sliver, name, value) else: # should this be an assert / raise an exception? - print "WARNING: failed to find component_id", component_id + logger.error("WARNING: failed to find component_id %s" % component_id) def get_sliver_attributes(self, component_id, network=None): nodes = self.get_nodes({'component_id': '*%s*' % component_id}) diff --git a/sfa/server/threadedserver.py b/sfa/server/threadedserver.py index 2b8207c3..1a78f35a 100644 --- a/sfa/server/threadedserver.py +++ b/sfa/server/threadedserver.py @@ -43,6 +43,7 @@ def verify_callback(conn, x509, err, depth, preverify): # and ignore them # XXX SMBAKER: I don't know what this error is, but it's being returned + # xxx thierry: this most likely means the cert has a validity range in the future # by newer pl nodes. if err == 9: #print " X509_V_ERR_CERT_NOT_YET_VALID" @@ -72,7 +73,7 @@ def verify_callback(conn, x509, err, depth, preverify): #print " X509_V_ERR_CERT_UNTRUSTED" return 1 - print " error", err, "in verify_callback" + logger.debug(" error %s in verify_callback"%err) return 0 -- 2.43.0