Changing agent.conf to accept cep.urls
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/1ac15fa3 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/1ac15fa3 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/1ac15fa3 Branch: refs/heads/stratos-4.1.x Commit: 1ac15fa3a8920bdd2b062274317530e2c2904f69 Parents: 82ac4d7 Author: anuruddhal <[email protected]> Authored: Wed Sep 16 16:05:23 2015 +0530 Committer: anuruddhal <[email protected]> Committed: Fri Sep 18 09:53:18 2015 +0530 ---------------------------------------------------------------------- .../python/cartridge.agent/cartridge.agent/healthstats.py | 7 ++++--- .../src/test/resources/ADCMTAppTenantUserTestCase/agent.conf | 3 +-- .../src/test/resources/ADCMTAppTestCase/agent.conf | 3 +-- .../src/test/resources/ADCTestCase/agent.conf | 3 +-- .../src/test/resources/AgentStartupTestCase/agent.conf | 3 +-- 5 files changed, 8 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/1ac15fa3/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/healthstats.py ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/healthstats.py b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/healthstats.py index 71e6d2f..eb140c0 100644 --- a/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/healthstats.py +++ b/components/org.apache.stratos.python.cartridge.agent/src/main/python/cartridge.agent/cartridge.agent/healthstats.py @@ -99,7 +99,7 @@ class HealthStatisticsPublisher: cep_admin_username = HealthStatisticsPublisher.read_config(constants.CEP_SERVER_ADMIN_USERNAME) cep_admin_password = HealthStatisticsPublisher.read_config(constants.CEP_SERVER_ADMIN_PASSWORD) # 1.1.1.1:1883,2.2.2.2:1883 - cep_urls = HealthStatisticsPublisher.read_config(constants.CEP_RECEIVER_URLS); + cep_urls = HealthStatisticsPublisher.read_config(constants.CEP_RECEIVER_URLS) cep_urls = cep_urls.split(',') for cep_url in cep_urls: self.ports = [] @@ -131,7 +131,8 @@ class HealthStatisticsPublisher: self.publishers.append(publisher) - HealthStatisticsPublisher.log.debug("HealthStatisticsPublisher initialized") + HealthStatisticsPublisher.log.debug("HealthStatisticsPublisher initialized. %r %r", + cep_ip, cep_port) @staticmethod def create_stream_definition(): @@ -177,7 +178,7 @@ class HealthStatisticsPublisher: event.payloadData, self.stream_definition.version)) - self.publish_event(self.publishers, event) + self.publish_event(event) def publish_load_average(self, load_avg): """ http://git-wip-us.apache.org/repos/asf/stratos/blob/1ac15fa3/products/python-cartridge-agent/modules/integration/test-integration/src/test/resources/ADCMTAppTenantUserTestCase/agent.conf ---------------------------------------------------------------------- diff --git a/products/python-cartridge-agent/modules/integration/test-integration/src/test/resources/ADCMTAppTenantUserTestCase/agent.conf b/products/python-cartridge-agent/modules/integration/test-integration/src/test/resources/ADCMTAppTenantUserTestCase/agent.conf index f945968..89eeae3 100755 --- a/products/python-cartridge-agent/modules/integration/test-integration/src/test/resources/ADCMTAppTenantUserTestCase/agent.conf +++ b/products/python-cartridge-agent/modules/integration/test-integration/src/test/resources/ADCMTAppTenantUserTestCase/agent.conf @@ -19,8 +19,7 @@ mb.ip =localhost mb.port =1885 listen.address =localhost -thrift.receiver.ip =localhost -thrift.receiver.port =7712 +thrift.receiver.urls =localhost:7712 thrift.server.admin.username =admin thrift.server.admin.password =admin cep.stats.publisher.enabled =true http://git-wip-us.apache.org/repos/asf/stratos/blob/1ac15fa3/products/python-cartridge-agent/modules/integration/test-integration/src/test/resources/ADCMTAppTestCase/agent.conf ---------------------------------------------------------------------- diff --git a/products/python-cartridge-agent/modules/integration/test-integration/src/test/resources/ADCMTAppTestCase/agent.conf b/products/python-cartridge-agent/modules/integration/test-integration/src/test/resources/ADCMTAppTestCase/agent.conf index 6444c2e..452129d 100755 --- a/products/python-cartridge-agent/modules/integration/test-integration/src/test/resources/ADCMTAppTestCase/agent.conf +++ b/products/python-cartridge-agent/modules/integration/test-integration/src/test/resources/ADCMTAppTestCase/agent.conf @@ -19,8 +19,7 @@ mb.ip =localhost mb.port =1885 listen.address =localhost -thrift.receiver.ip =localhost -thrift.receiver.port =7712 +thrift.receiver.urls =localhost:7712 thrift.server.admin.username =admin thrift.server.admin.password =admin cep.stats.publisher.enabled =true http://git-wip-us.apache.org/repos/asf/stratos/blob/1ac15fa3/products/python-cartridge-agent/modules/integration/test-integration/src/test/resources/ADCTestCase/agent.conf ---------------------------------------------------------------------- diff --git a/products/python-cartridge-agent/modules/integration/test-integration/src/test/resources/ADCTestCase/agent.conf b/products/python-cartridge-agent/modules/integration/test-integration/src/test/resources/ADCTestCase/agent.conf index fd3e423..42922ec 100755 --- a/products/python-cartridge-agent/modules/integration/test-integration/src/test/resources/ADCTestCase/agent.conf +++ b/products/python-cartridge-agent/modules/integration/test-integration/src/test/resources/ADCTestCase/agent.conf @@ -19,8 +19,7 @@ mb.ip =localhost mb.port =1885 listen.address =localhost -thrift.receiver.ip =localhost -thrift.receiver.port =7712 +thrift.receiver.urls =localhost:7712 thrift.server.admin.username =admin thrift.server.admin.password =admin cep.stats.publisher.enabled =true http://git-wip-us.apache.org/repos/asf/stratos/blob/1ac15fa3/products/python-cartridge-agent/modules/integration/test-integration/src/test/resources/AgentStartupTestCase/agent.conf ---------------------------------------------------------------------- diff --git a/products/python-cartridge-agent/modules/integration/test-integration/src/test/resources/AgentStartupTestCase/agent.conf b/products/python-cartridge-agent/modules/integration/test-integration/src/test/resources/AgentStartupTestCase/agent.conf index 0038b7d..41dfa38 100755 --- a/products/python-cartridge-agent/modules/integration/test-integration/src/test/resources/AgentStartupTestCase/agent.conf +++ b/products/python-cartridge-agent/modules/integration/test-integration/src/test/resources/AgentStartupTestCase/agent.conf @@ -19,8 +19,7 @@ mb.ip =localhost mb.port =1885 listen.address =localhost -thrift.receiver.ip =localhost -thrift.receiver.port =7712 +thrift.receiver.urls =localhost:7712 thrift.server.admin.username =admin thrift.server.admin.password =admin cep.stats.publisher.enabled =true
