openstack/deb-python-pysaml2
Code Issues Proposed changes

Fixed so that all logging are presented as one time line.

Browse Source
This commit is contained in:
Roland Hedberg
2013-08-29 12:56:25 +02:00
parent 1e758bba56
commit fa9a0d3b4b
1 changed files with 20 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/idp_test/__init__.py
View File

@@ -47,22 +47,20 @@ formatter_2 = logging.Formatter("%(delta).6f - %(levelname)s - [%(name)s] %(mess
cf = ContextFilter() cf = ContextFilter()
cf.start() cf.start()
memoryhandler = logging.handlers.MemoryHandler(1024*10, logging.DEBUG) streamhandler = logging.StreamHandler(sys.stderr)
streamhandler.setFormatter(formatter_2)
pys_streamhandler = logging.StreamHandler(sys.stderr) # pys_memoryhandler = logging.handlers.MemoryHandler(1024*10, logging.DEBUG)
pys_streamhandler.setFormatter(formatter_2) # pys_memoryhandler.setFormatter(formatter_2)
# pys_memoryhandler.addFilter(cf)
# root_logger.addHandler(pys_memoryhandler)
# root_logger.setLevel(logging.DEBUG)
pys_memoryhandler = logging.handlers.MemoryHandler(1024*10, logging.DEBUG) logger = logging.getLogger(__name__)
pys_memoryhandler.setFormatter(formatter_2)
pys_memoryhandler.addFilter(cf)
root_logger.addHandler(pys_memoryhandler)
root_logger.setLevel(logging.DEBUG)
tracelog = logging.getLogger(__name__)
t_memoryhandler = logging.handlers.MemoryHandler(1024*10, logging.DEBUG) t_memoryhandler = logging.handlers.MemoryHandler(1024*10, logging.DEBUG)
t_memoryhandler.addFilter(cf) t_memoryhandler.addFilter(cf)
tracelog.addHandler(t_memoryhandler) logger.addHandler(t_memoryhandler)
tracelog.setLevel(logging.DEBUG) logger.setLevel(logging.DEBUG)
saml2testlog = logging.getLogger("saml2test") saml2testlog = logging.getLogger("saml2test")
saml2testlog.addHandler(t_memoryhandler) saml2testlog.addHandler(t_memoryhandler)
@@ -253,15 +251,18 @@ class SAML2client(object):
memhndlr.setTarget(hndlr2) memhndlr.setTarget(hndlr2)
memhndlr.flush() memhndlr.flush()
memhndlr.close() memhndlr.close()
# pys_streamhandler.setFormatter(formatter_2) # streamhandler.setFormatter(formatter_2)
# pys_memoryhandler.setTarget(pys_streamhandler) # pys_memoryhandler.setTarget(streamhandler)
# pys_memoryhandler.flush() # pys_memoryhandler.flush()
# pys_memoryhandler.close() # pys_memoryhandler.close()
def run(self): def run(self):
HANDLER = ""
self.args = self._parser.parse_args() self.args = self._parser.parse_args()
if self.args.pysamllog:
root_logger.addHandler(t_memoryhandler)
root_logger.setLevel(logging.DEBUG)
if self.args.operations: if self.args.operations:
path, name = os.path.split(self.args.operations) path, name = os.path.split(self.args.operations)
self.operations = get_mod(name, [path]) self.operations = get_mod(name, [path])
@@ -281,15 +282,6 @@ class SAML2client(object):
self.args.oper = self.args.oper.strip("'") self.args.oper = self.args.oper.strip("'")
self.args.oper = self.args.oper.strip('"') self.args.oper = self.args.oper.strip('"')
if self.args.log:
HANDLER = "stream"
# streamhandler.setFormatter(formatter_2)
# logger.addHandler(streamhandler)
elif self.args.debug:
HANDLER = "memory"
# memoryhandler.setFormatter(formatter_2)
# logger.addHandler(memoryhandler)
try: try:
self.setup() self.setup()
except (AttributeError, ToOld), err: except (AttributeError, ToOld), err:
@@ -311,13 +303,13 @@ class SAML2client(object):
try: try:
oper = self.tests.OPERATIONS[self.args.oper] oper = self.tests.OPERATIONS[self.args.oper]
except ValueError: except ValueError:
tracelog.error("Undefined testcase") logger.error("Undefined testcase")
return return
else: else:
tracelog.error("Undefined testcase") logger.error("Undefined testcase")
return return
tracelog.info("Starting conversation") logger.info("Starting conversation")
conv = Conversation(self.client, self.sp_config, self.interactions, conv = Conversation(self.client, self.sp_config, self.interactions,
check_factory=self.check_factory, check_factory=self.check_factory,
entity_id=self.entity_id, entity_id=self.entity_id,
@@ -350,11 +342,8 @@ class SAML2client(object):
else: else:
print >> sys.stdout, json.dumps(tsum) print >> sys.stdout, json.dumps(tsum)
if self.args.pysamllog and HANDLER == "memory":
self.output_log(pys_memoryhandler, pys_streamhandler)
if tsum["status"] > 1 or self.args.debug or err: if tsum["status"] > 1 or self.args.debug or err:
self.output_log(t_memoryhandler, pys_streamhandler) self.output_log(t_memoryhandler, streamhandler)
def list_operations(self): def list_operations(self):
lista = [] lista = []