From 3f58f2f06ffdb748e494909a778b595ab98025eb Mon Sep 17 00:00:00 2001 From: "enus.linden" Date: Fri, 6 Feb 2009 00:29:40 +0000 Subject: [PATCH] adding param to flip caps logging --- pyogp/lib/base/caps.py | 10 ++++++---- pyogp/lib/base/settings.py | 3 +++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pyogp/lib/base/caps.py b/pyogp/lib/base/caps.py index a651585..058afed 100644 --- a/pyogp/lib/base/caps.py +++ b/pyogp/lib/base/caps.py @@ -27,6 +27,7 @@ from logging import getLogger, CRITICAL, ERROR, WARNING, INFO, DEBUG from indra.base import llsd from network.stdlib_client import StdLibClient, HTTPError import exc +from settings import Settings # initialize logging logger = getLogger('pyogp.lib.base.caps') @@ -45,12 +46,13 @@ class Capability(object): self.name = name self.public_url = public_url + self.settings = Settings() #log(DEBUG, 'instantiated cap %s' %self) def GET(self,custom_headers={}): """call this capability, return the parsed result""" - log(DEBUG, '%s: GETing %s' %(self.name, self.public_url)) + if self.settings.ENABLE_CAPS_LOGGING: log(DEBUG, '%s: GETing %s' %(self.name, self.public_url)) try: response = self.restclient.GET(self.public_url) @@ -71,7 +73,7 @@ class Capability(object): raise exc.DeserializerNotFound(content_type) data = deserializer.deserialize_string(response.body) - log(DEBUG, 'Get of cap %s response is: %s' % (self.public_url, data)) + if self.settings.ENABLE_CAPS_LOGGING: log(DEBUG, 'Get of cap %s response is: %s' % (self.public_url, data)) return data @@ -79,7 +81,7 @@ class Capability(object): def POST(self,payload,custom_headers={}): """call this capability, return the parsed result""" - log(DEBUG, 'Sending to cap %s the following payload: %s' %(self.public_url, payload)) + if self.settings.ENABLE_CAPS_LOGGING: log(DEBUG, 'Sending to cap %s the following payload: %s' %(self.public_url, payload)) # serialize the data if (type(payload) is ListType): @@ -116,7 +118,7 @@ class Capability(object): raise exc.DeserializerNotFound(content_type) data = deserializer.deserialize_string(response.body) - log(DEBUG, 'Post to cap %s response is: %s' % (self.public_url, data)) + if self.settings.ENABLE_CAPS_LOGGING: log(DEBUG, 'Post to cap %s response is: %s' % (self.public_url, data)) return data diff --git a/pyogp/lib/base/settings.py b/pyogp/lib/base/settings.py index 2f5db8b..42cf035 100644 --- a/pyogp/lib/base/settings.py +++ b/pyogp/lib/base/settings.py @@ -33,7 +33,10 @@ class Settings(object): # Application behavior settings self.HANDLE_PACKETS = True + + # Logging behaviors self.ENABLE_BYTES_TO_HEX_LOGGING = True + self.ENABLE_CAPS_LOGGING = True # parameters for xmplrpc login def get_default_xmlrpc_login_parameters(self):