You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ga...@apache.org on 2015/10/14 10:54:47 UTC
[1/2] stratos git commit: checking all the das nodes for stats
publisher enabled check
Repository: stratos
Updated Branches:
refs/heads/stratos-4.1.x 28f3d4508 -> 63ea5e373
checking all the das nodes for stats publisher enabled check
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/63ea5e37
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/63ea5e37
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/63ea5e37
Branch: refs/heads/stratos-4.1.x
Commit: 63ea5e373a072f8022b27ac85268e2f81f9a05a3
Parents: 5f07b2a
Author: Thanuja <th...@wso2.com>
Authored: Wed Oct 14 01:08:48 2015 +0530
Committer: gayangunarathne <ga...@wso2.com>
Committed: Wed Oct 14 14:24:33 2015 +0530
----------------------------------------------------------------------
.../console/controllers/login/login.jag | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/63ea5e37/components/org.apache.stratos.manager.console/console/controllers/login/login.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/login/login.jag b/components/org.apache.stratos.manager.console/console/controllers/login/login.jag
index 6f707c9..ef495f9 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/login/login.jag
+++ b/components/org.apache.stratos.manager.console/console/controllers/login/login.jag
@@ -28,8 +28,14 @@ var log = new Log("controller.login"),
hostName = conf. *::['HostName'].text().toString(),
conf = carbon.server.loadConfig('thrift-client-config.xml'),
dasConfig = conf. *::['config']. *::['das'],
- dasStatsPublisherEnabled = dasConfig.node[0].statsPublisherEnabled.text();
+ dasStatsPublisherEnabled = false;
+for (var i = 0; i < dasConfig.node.length(); i++) {
+ dasStatsPublisherEnabled = dasConfig.node[i].statsPublisherEnabled.text();
+ if (dasStatsPublisherEnabled == true) {
+ break;
+ }
+}
if (hostName === null || hostName === '') {
hostName = 'localhost';
[2/2] stratos git commit: Changing the logic to check
dasStatsPublisherEnabled in login.jag
Posted by ga...@apache.org.
Changing the logic to check dasStatsPublisherEnabled in login.jag
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/5f07b2af
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/5f07b2af
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/5f07b2af
Branch: refs/heads/stratos-4.1.x
Commit: 5f07b2afab1e7a37f0a7e47c5f94e96d7b569b85
Parents: 28f3d45
Author: Thanuja <th...@wso2.com>
Authored: Tue Oct 13 23:20:36 2015 +0530
Committer: gayangunarathne <ga...@wso2.com>
Committed: Wed Oct 14 14:24:33 2015 +0530
----------------------------------------------------------------------
.../console/controllers/login/login.jag | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/5f07b2af/components/org.apache.stratos.manager.console/console/controllers/login/login.jag
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager.console/console/controllers/login/login.jag b/components/org.apache.stratos.manager.console/console/controllers/login/login.jag
index 6a78ecf..6f707c9 100644
--- a/components/org.apache.stratos.manager.console/console/controllers/login/login.jag
+++ b/components/org.apache.stratos.manager.console/console/controllers/login/login.jag
@@ -27,8 +27,8 @@ var log = new Log("controller.login"),
offset = conf. *::['Ports']. *::['Offset'].text(),
hostName = conf. *::['HostName'].text().toString(),
conf = carbon.server.loadConfig('thrift-client-config.xml'),
- dasConfig = conf. *::['config'].(name == "das"),
- dasStatsPublisherEnabled = dasConfig.statsPublisherEnabled.text();
+ dasConfig = conf. *::['config']. *::['das'],
+ dasStatsPublisherEnabled = dasConfig.node[0].statsPublisherEnabled.text();
if (hostName === null || hostName === '') {