Fixed import error in databridge module, added log points
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/32d2ecc6 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/32d2ecc6 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/32d2ecc6 Branch: refs/heads/master Commit: 32d2ecc66544aea6117f9d5498b3c3c7ce24bdf8 Parents: 7cc189e Author: Chamila de Alwis <[email protected]> Authored: Wed Oct 15 18:54:11 2014 +0530 Committer: Chamila de Alwis <[email protected]> Committed: Wed Oct 15 18:54:11 2014 +0530 ---------------------------------------------------------------------- .../cartridge-agent/modules/databridge/agent.py | 10 +++++++--- .../modules/databridge/thrift/publisher.py | 4 +++- 2 files changed, 10 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/32d2ecc6/tools/python-cartridge-agent/cartridge-agent/modules/databridge/agent.py ---------------------------------------------------------------------- diff --git a/tools/python-cartridge-agent/cartridge-agent/modules/databridge/agent.py b/tools/python-cartridge-agent/cartridge-agent/modules/databridge/agent.py index e5700a0..c4357df 100644 --- a/tools/python-cartridge-agent/cartridge-agent/modules/databridge/agent.py +++ b/tools/python-cartridge-agent/cartridge-agent/modules/databridge/agent.py @@ -148,7 +148,6 @@ class ThriftPublisher: :param ThriftEvent event: The log event to be published :return: void """ - ThriftPublisher.log.debug("ABOUT TO PUBLISH: POPULATING DATA") event_bundler = EventBundle() ThriftPublisher.assign_attributes(event.metaData, event_bundler) ThriftPublisher.assign_attributes(event.correlationData, event_bundler) @@ -184,16 +183,21 @@ class ThriftPublisher: if attributes is not None and len(attributes) > 0: for attrib in attributes: if isinstance(attrib, int): + ThriftPublisher.log.debug("Int : %r" % attrib) event_bundler.addIntAttribute(attrib) elif isinstance(attrib, long): + ThriftPublisher.log.debug("Long : %r" % attrib) event_bundler.addLongAttribute(attrib) elif isinstance(attrib, float): + ThriftPublisher.log.debug("Float : %r" % attrib) event_bundler.addDoubleAttribute(attrib) elif isinstance(attrib, bool): + ThriftPublisher.log.debug("Bool : %r" % attrib) event_bundler.addBoolAttribute(attrib) elif isinstance(attrib, str): + ThriftPublisher.log.debug("Str : %r" % attrib) event_bundler.addStringAttribute(attrib) else: ThriftPublisher.log.error("Undefined attribute type: %r" % attrib) - - ThriftPublisher.log.debug("Empty attribute list") + else: + ThriftPublisher.log.debug("Empty attribute list") http://git-wip-us.apache.org/repos/asf/stratos/blob/32d2ecc6/tools/python-cartridge-agent/cartridge-agent/modules/databridge/thrift/publisher.py ---------------------------------------------------------------------- diff --git a/tools/python-cartridge-agent/cartridge-agent/modules/databridge/thrift/publisher.py b/tools/python-cartridge-agent/cartridge-agent/modules/databridge/thrift/publisher.py index 99d9f1f..b33c8ac 100644 --- a/tools/python-cartridge-agent/cartridge-agent/modules/databridge/thrift/publisher.py +++ b/tools/python-cartridge-agent/cartridge-agent/modules/databridge/thrift/publisher.py @@ -22,6 +22,7 @@ sys.path.append("gen") from gen.ThriftSecureEventTransmissionService import ThriftSecureEventTransmissionService from gen.ThriftSecureEventTransmissionService.ttypes import * +from gen.Data.ttypes import ThriftEventBundle from thrift.transport import TSSLSocket from thrift.transport import TTransport @@ -64,6 +65,7 @@ class Publisher: event.addStringAttribute(self.streamId) #event.addStringAttribute(msg) # Publish + print "TO THE WIRE!!! " Publisher.client.publish(event.getEventBundle()) def disconnect(self): @@ -105,7 +107,7 @@ class EventBundle: self.__stringAttributeList.append(attr) def getEventBundle(self): - return Data.ttypes.ThriftEventBundle(self.__sessionId, self.__eventNum, self.__intAttributeList, + return ThriftEventBundle(self.__sessionId, self.__eventNum, self.__intAttributeList, self.__longAttributeList, self.__doubleAttributeList, self.__boolAttributeList, self.__stringAttributeList, self.__arbitraryDataMapMap)
